[libvirt] [PATCHv2 6/6] Remove obsolete function virFDStreamSetIOHelper()

Eric Blake eblake at redhat.com
Wed Apr 23 20:55:20 UTC 2014


On 03/25/2014 02:23 AM, Nehal J Wani wrote:
> Now that we have virSetUninstalledDir() and virGetUninstalledDir(), we
> no longer need virFDStreamSetIOHelper().
> 
> ---

> -static const char *iohelper_path = LIBEXECDIR "/libvirt_iohelper";
> -
> -void virFDStreamSetIOHelper(const char *path)
> -{
> -    if (path == NULL)
> -        iohelper_path = LIBEXECDIR "/libvirt_iohelper";
> -    else
> -        iohelper_path = path;
> -}

Problem.  Just because we have virGetUninstalldDir() doesn't mean we are
using that, unless you ALSO fix the testsuite to call
virSetUninstalledDir().  As written, your series only calls
virSetUninstalledDir() in daemon/libvirtd.c,...

> +++ b/tests/fdstreamtest.c
> @@ -321,9 +321,6 @@ mymain(void)
>  {
>      char scratchdir[] = SCRATCHDIRTEMPLATE;
>      int ret = 0;
> -    const char *iohelper = abs_builddir "/../src/libvirt_iohelper";
> -
> -    virFDStreamSetIOHelper(iohelper);
>  

...but fdstreamtest.c is not using daemon/libvirtd.c, which means you
just broke this file into running the pre-installed version instead of
the in-tree version.  For this series to work, you need to make
testutils.c call virSetUninstalledDir on behalf of all test programs.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140423/9fd79f98/attachment-0001.sig>


More information about the libvir-list mailing list