[libvirt] [PATCH] make consistent assumptions about libvirtd dependence

Hi - Currently src/Makefile.am says that only the QEMU, LXC, and storage drivers are dependent on libvirtd. But the driver registration code in virInitialize wasn't registering the remote or openVz driver when WITH_LIBVIRTD was not defined. The attached patch makes the virInitialize code consistent with the assumptions stated in src/Makefile.am. But note I'm assuming the assumptions in src/Makefile.am are correct. I'm not sure what's really dependent on libvirtd, so Someone Who Knows Better should verify this. Thanks, Dave commit 24d5708877fce90c4e85e3b2ede07b74f4a98224 Author: David Lively <dlively@virtualiron.com> Date: Thu Sep 11 11:56:20 2008 -0400 Make driver registration assume the same libvirtd dependences expressed in src/Makefile.am (i.e., that only the QEMU, LXC, and storage drivers depend on libvirtd). diff --git a/src/libvirt.c b/src/libvirt.c index 54ed8cf..3d66f5a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -286,20 +286,20 @@ virInitialize(void) #ifdef WITH_XEN if (xenUnifiedRegister () == -1) return -1; #endif -#ifdef WITH_LIBVIRTD -#ifdef WITH_QEMU - if (qemudRegister() == -1) return -1; +#ifdef WITH_REMOTE + if (remoteRegister () == -1) return -1; #endif #ifdef WITH_OPENVZ if (openvzRegister() == -1) return -1; #endif +#ifdef WITH_LIBVIRTD +#ifdef WITH_QEMU + if (qemudRegister() == -1) return -1; +#endif #ifdef WITH_LXC if (lxcRegister() == -1) return -1; #endif if (storageRegister() == -1) return -1; -#ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; -#endif #endif return(0);

On Thu, Sep 11, 2008 at 03:23:11PM -0400, David Lively wrote:
Hi - Currently src/Makefile.am says that only the QEMU, LXC, and storage drivers are dependent on libvirtd. But the driver registration code in virInitialize wasn't registering the remote or openVz driver when WITH_LIBVIRTD was not defined. The attached patch makes the virInitialize code consistent with the assumptions stated in src/Makefile.am. But note I'm assuming the assumptions in src/Makefile.am are correct. I'm not sure what's really dependent on libvirtd, so Someone Who Knows Better should verify this.
Yes this looks good, and an important fix for MinGW too. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top
participants (2)
-
David Lively
-
Richard W.M. Jones