- Devel - libvirt List Archives

[libvirt] libvirt-0.10.2-46 compress failed
by 饶俊明 22 Apr '15

22 Apr '15

Hello When compress libvirt-0.10.2-46.el6.src.rpm to support rbd, then failed; Error log: cc1: warnings being treated as errors storage/storage_backend_rbd.c: In function 'virStorageBackendRBDRefreshPool': storage/storage_backend_rbd.c:284: error: declaration of 'stat' shadows a global declaration [-Wshadow] /usr/include/sys/stat.h:455: error: shadowed declaration is here [-Wshadow] At top level: cc1: error: unrecognized command line option "-Wno-suggest-attribute=const" cc1: error: unrecognized command line option "-Wno-suggest-attribute=pure" make[3]: *** [libvirt_driver_storage_impl_la-storage_backend_rbd.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory `/home/ada/rpmbuild/BUILD/libvirt-0.10.2/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/ada/rpmbuild/BUILD/libvirt-0.10.2/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/ada/rpmbuild/BUILD/libvirt-0.10.2' make: *** [all] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.g0IuFq (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.g0IuFq (%build) Thanks!!! ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. �跺��欢��娉ㄦ�锛��浠跺�淇��淇℃�锛��璇��浠讹�璇峰�蹇��ュ��汉骞剁��ュ��伙�涓��浣跨��澶��浠躲� 杩��欢��版��浠跺��藉��淇��涪澶便�琚��璁＄��虹�姣��涓��ㄦ��点� ********************************************************************************************************************************

2 3

[libvirt] [PATCH] util: fix build on non-Linux
by Roman Bogorodskiy 22 Apr '15

22 Apr '15

Build fails on non-Linux systems with this error: CC util/libvirt_util_la-virnetdev.lo util/virnetdev.c:364:1: error: unused function 'virNetDevReplaceMacAddress' [-Werror,-Wunused-function] virNetDevReplaceMacAddress(const char *linkdev, ^ util/virnetdev.c:406:1: error: unused function 'virNetDevRestoreMacAddress' [-Werror,-Wunused-function] virNetDevRestoreMacAddress(const char *linkdev, ^ 2 errors generated. The virNetDev{Restore,Replace}MacAddress() functions are only used by VF-related routines that are available on Linux only. So move these functions under the same #ifdef. --- src/util/virnetdev.c | 176 ++++++++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 87 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b7ea524..5069064 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -351,93 +351,6 @@ int virNetDevGetMAC(const char *ifname, -/** - * virNetDevReplaceMacAddress: - * @macaddress: new MAC address for interface - * @linkdev: name of interface - * @stateDir: directory to store old MAC address - * - * Returns 0 on success, -1 on failure - * - */ -static int -virNetDevReplaceMacAddress(const char *linkdev, - const virMacAddr *macaddress, - const char *stateDir) -{ - virMacAddr oldmac; - char *path = NULL; - char macstr[VIR_MAC_STRING_BUFLEN]; - int ret = -1; - - if (virNetDevGetMAC(linkdev, &oldmac) < 0) - return -1; - - if (virAsprintf(&path, "%s/%s", - stateDir, - linkdev) < 0) - return -1; - virMacAddrFormat(&oldmac, macstr); - if (virFileWriteStr(path, macstr, O_CREAT|O_TRUNC|O_WRONLY) < 0) { - virReportSystemError(errno, _("Unable to preserve mac for %s"), - linkdev); - goto cleanup; - } - - if (virNetDevSetMAC(linkdev, macaddress) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FREE(path); - return ret; -} - -/** - * virNetDevRestoreMacAddress: - * @linkdev: name of interface - * @stateDir: directory containing old MAC address - * - * Returns 0 on success, -errno on failure. - * - */ -static int -virNetDevRestoreMacAddress(const char *linkdev, - const char *stateDir) -{ - int rc = -1; - char *oldmacname = NULL; - char *macstr = NULL; - char *path = NULL; - virMacAddr oldmac; - - if (virAsprintf(&path, "%s/%s", - stateDir, - linkdev) < 0) - return -1; - - if (virFileReadAll(path, VIR_MAC_STRING_BUFLEN, &macstr) < 0) - goto cleanup; - - if (virMacAddrParse(macstr, &oldmac) != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse MAC address from '%s'"), - oldmacname); - goto cleanup; - } - - /*reset mac and remove file-ignore results*/ - rc = virNetDevSetMAC(linkdev, &oldmac); - ignore_value(unlink(path)); - - cleanup: - VIR_FREE(macstr); - VIR_FREE(path); - return rc; -} - - #if defined(SIOCGIFMTU) && defined(HAVE_STRUCT_IFREQ) /** * virNetDevGetMTU: @@ -1923,6 +1836,95 @@ virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED, #endif /* !__linux__ */ #if defined(__linux__) && defined(HAVE_LIBNL) && defined(IFLA_VF_MAX) + +/** + * virNetDevReplaceMacAddress: + * @macaddress: new MAC address for interface + * @linkdev: name of interface + * @stateDir: directory to store old MAC address + * + * Returns 0 on success, -1 on failure + * + */ +static int +virNetDevReplaceMacAddress(const char *linkdev, + const virMacAddr *macaddress, + const char *stateDir) +{ + virMacAddr oldmac; + char *path = NULL; + char macstr[VIR_MAC_STRING_BUFLEN]; + int ret = -1; + + if (virNetDevGetMAC(linkdev, &oldmac) < 0) + return -1; + + if (virAsprintf(&path, "%s/%s", + stateDir, + linkdev) < 0) + return -1; + virMacAddrFormat(&oldmac, macstr); + if (virFileWriteStr(path, macstr, O_CREAT|O_TRUNC|O_WRONLY) < 0) { + virReportSystemError(errno, _("Unable to preserve mac for %s"), + linkdev); + goto cleanup; + } + + if (virNetDevSetMAC(linkdev, macaddress) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + return ret; +} + +/** + * virNetDevRestoreMacAddress: + * @linkdev: name of interface + * @stateDir: directory containing old MAC address + * + * Returns 0 on success, -errno on failure. + * + */ +static int +virNetDevRestoreMacAddress(const char *linkdev, + const char *stateDir) +{ + int rc = -1; + char *oldmacname = NULL; + char *macstr = NULL; + char *path = NULL; + virMacAddr oldmac; + + if (virAsprintf(&path, "%s/%s", + stateDir, + linkdev) < 0) + return -1; + + if (virFileReadAll(path, VIR_MAC_STRING_BUFLEN, &macstr) < 0) + goto cleanup; + + if (virMacAddrParse(macstr, &oldmac) != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse MAC address from '%s'"), + oldmacname); + goto cleanup; + } + + /*reset mac and remove file-ignore results*/ + rc = virNetDevSetMAC(linkdev, &oldmac); + ignore_value(unlink(path)); + + cleanup: + VIR_FREE(macstr); + VIR_FREE(path); + return rc; +} + + + static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = { [IFLA_VF_MAC] = { .type = NLA_UNSPEC, .maxlen = sizeof(struct ifla_vf_mac) }, -- 2.3.5

2 2

[libvirt] [PATCHv2] qemu: Fix issues with maxMemory in qemuDomainSetMemoryFlags()
by Peter Krempa 22 Apr '15

22 Apr '15

From: Luyao Huang <lhuang(a)redhat.com> qemuDomainSetMemoryFlags() would allow to set the initial memory greater than the <maxMemory> field. While the configuration would not work as memory hotplug requires NUMA to be enabled and the qemuDomainSetMemoryFlags() API does not work on NUMA guests this just fixes a corner case. The fix is still worth though as it allows to induce an invalid configuration and make the VM vanish on libvirt restart. Additionally this tweaks error message to be more accurate. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Version 2 tweaks the error messages to be (possibly) more descriptive. src/qemu/qemu_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6700fc9..d15931c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2319,11 +2319,19 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, * is no way to change the individual node sizes with this API */ if (virDomainNumaGetNodeCount(persistentDef->numa) > 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("maximum memory size of a domain with NUMA " + _("initial memory size of a domain with NUMA " "nodes cannot be modified with this API")); goto endjob; } + if (persistentDef->mem.max_memory && + persistentDef->mem.max_memory < newmem) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot set initial memory size biger than " + "the maximum memory size")); + goto endjob; + } + virDomainDefSetMemoryInitial(persistentDef, newmem); if (persistentDef->mem.cur_balloon > newmem) -- 2.2.2

2 2

Re: [libvirt] Plan for next release
by Daniel Veillard 22 Apr '15

22 Apr '15

So if we want to push the next release for May 1st, it seems we should enter freeze over the w.e. or early Monday morning. Unless there is disagreement I plan to proceed that way, hopefully getting next release on time :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 00/11] caps: various internal cleanups
by Cole Robinson 21 Apr '15

21 Apr '15

First two patches are straight bug fixes. The rest is a bunch of internal cleanup I felt compelled to do. Summary is - Switch caps and domain to use an enum for os.type value (hvm, xen, exe, ...) - Switch caps to use VIR_DOMAIN_VIRT* internally - Add a single function for looking up domain XML relevant values from capabilities, and test the crap out of it. - Use that function to simplfy and improve a lot of code. Thanks, Cole Cole Robinson (11): domain: conf: Better errors on bad os <type> values domain: conf: Don't validate VM ostype/arch at daemon startup caps: Use an enum internally for ostype value caps: Switch AddGuest to take VIR_DOMAIN_OSTYPE value domain: Convert os.type to VIR_DOMAIN_OSTYPE enum caps: Convert to use VIR_DOMAIN_VIRT internally caps: Add virCapabilitiesDomainDataLookup domain: conf: Do ostype/arch/machine parsing earlier domain: conf: Use CapabilitiesDomainDataLookup for caps validation caps: Use DomainDataLookup to replace GuestDefault* domain: conf: Drop expectedVirtTypes src/bhyve/bhyve_capabilities.c | 6 +- src/bhyve/bhyve_driver.c | 5 - src/conf/capabilities.c | 307 ++++++++++++-------------- src/conf/capabilities.h | 50 ++--- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 331 +++++++++++------------------ src/conf/domain_conf.h | 25 ++- src/conf/snapshot_conf.c | 18 +- src/conf/snapshot_conf.h | 2 - src/esx/esx_driver.c | 12 +- src/hyperv/hyperv_driver.c | 4 +- src/libvirt_private.syms | 6 +- src/libxl/libxl_conf.c | 14 +- src/libxl/libxl_domain.c | 7 +- src/libxl/libxl_driver.c | 8 +- src/libxl/libxl_migration.c | 2 - src/lxc/lxc_conf.c | 8 +- src/lxc/lxc_controller.c | 1 - src/lxc/lxc_driver.c | 7 +- src/lxc/lxc_native.c | 4 +- src/openvz/openvz_conf.c | 7 +- src/openvz/openvz_driver.c | 7 +- src/parallels/parallels_driver.c | 23 +- src/parallels/parallels_sdk.c | 6 +- src/parallels/parallels_utils.h | 2 +- src/phyp/phyp_driver.c | 10 +- src/qemu/qemu_capabilities.c | 21 +- src/qemu/qemu_command.c | 29 +-- src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_migration.c | 5 +- src/security/virt-aa-helper.c | 9 +- src/test/test_driver.c | 12 +- src/uml/uml_conf.c | 4 +- src/uml/uml_driver.c | 6 +- src/util/virerror.c | 5 +- src/vbox/vbox_common.c | 23 +- src/vmware/vmware_conf.c | 8 +- src/vmware/vmware_driver.c | 4 +- src/vmx/vmx.c | 3 +- src/xen/xen_driver.c | 5 +- src/xen/xen_hypervisor.c | 4 +- src/xen/xend_internal.c | 6 +- src/xenapi/xenapi_driver.c | 20 +- src/xenapi/xenapi_utils.c | 4 +- src/xenconfig/xen_common.c | 64 +++--- src/xenconfig/xen_sxpr.c | 5 +- src/xenconfig/xen_xl.c | 17 +- src/xenconfig/xen_xm.c | 12 +- tests/Makefile.am | 8 +- tests/domainconftest.c | 3 +- tests/domainsnapshotxml2xmltest.c | 1 - tests/lxcxml2xmltest.c | 1 - tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 1 - tests/qemuhotplugtest.c | 1 - tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmltest.c | 3 +- tests/qemuxmlnstest.c | 1 - tests/securityselinuxlabeldata/chardev.xml | 2 +- tests/securityselinuxlabeldata/disks.xml | 2 +- tests/securityselinuxlabeldata/kernel.xml | 2 +- tests/securityselinuxlabeldata/nfs.xml | 2 +- tests/securityselinuxlabeltest.c | 4 +- tests/testutils.c | 8 +- tests/testutilslxc.c | 10 +- tests/testutilsqemu.c | 38 ++-- tests/testutilsxen.c | 18 +- tests/vircapstest.c | 209 +++++++++++++++++- tests/vmx2xmltest.c | 8 +- tests/xlconfigtest.c | 1 - tests/xmconfigtest.c | 1 - tests/xml2sexprtest.c | 1 - tests/xml2vmxtest.c | 9 +- 75 files changed, 742 insertions(+), 756 deletions(-) -- 2.3.5

3 22

[libvirt] [PATCH v3 0/6] Implement Add/Del IOThreads
by John Ferlan 21 Apr '15

21 Apr '15

v2: http://www.redhat.com/archives/libvir-list/2015-April/msg00426.html Differences: Patch 1 (old patch 3): - virDomainIOThreadIDDefParseXML: - Fix error message for <id> (was element, change to attribute for <iothread> element) - Silently bump the 'def->iothreads' count if there are a more <iothreadid> elements found than def->iothreads defined rather than causing an error - virDomainIOThreadIDAdd - Just use VIR_APPEND_ELEMENT - no need for empty array check - Remove virDomainIOThreadIDIsDuplicate - Since it was doing essentially the same as virDomainIOThreadIDFind - Replace callers of IDIsDuplicate with the IDFind - Remove 'name' from _virDomainIOThreadIDDef causes ripple effect... - formatdomain.html.in and docs/schemas/domaincommon.rng - No need for virDomainIOThreadIDDefFree - Change of parameters to virDomainIOThreadIDAdd - Remove parse in virDomainIOThreadIDDefParseXML - Remove format in virDomainDefFormatInternal - Remove virDomainIOThreadIDDefFree - Unnecessary since 'name' is removed Patch 2 (merged old patch 4 & 5) - Add 'thread_id' to virDomainIOThreadIDDef and remove from _qemuDomainObjPrivate. Adjust qemuDomainObjPrivateFree, qemuDomainObjPrivateXMLFormat, and qemuDomainObjPrivateXMLParse to remove the the iothreadpids usage. Rely on saved domain XML for the 'live' data. - Use vm->def->niothreadids instead of priv->niothreadpids - Remove a couple of (now) unnecessary checks where priv->[n]iothreadpids was referenced. Now we now that at XMLParse we've created the [vm->]def->iothreadids with enough elements to satisfy the maximum of def->iothreads and def->niothreadids, so no need to check if it exists like we had to for priv->iothreadpids Patch 3 (old patch 6) - Remove 'name' from virDomainAddIOThread - Fix comments in virDomainIOThreadAdd and virDomainIOThreadDel - Remove if ((unsigned short) iothread_id != iothread_id) check Patch 4 (old patch 7) - Remove 'name' from remote_domain_add_iothread_args and remote_domain_add_iothread_args Patch 5 (old patch 8) - Split qemuDomainHotplugIOThread into qemuDomainHotplugAddIOThread and qemuDomainHotplugDelIOThread - Removed extraneous comments - Moved active domain check to after job starts and only for LIVE - Removed the virResetLastError if qemuMonitorGetIOThreads fails - Didn't touch the Numatune change - that can be resolved separately - For the Add case, there was a comment about already having the data which while true, we don't know where in the returned qemu iothreads list the new IOThread was added, so we have to find it in the list so we can get the thread_id so save once we create the element in the iothreadids list. - Moved where the virDomainLiveConfigHelperMethod was called - For an inactive config - we can add iothreads and iothreadids, when/if someone starts the guest, then they'll get the bad news if the right emulator wasn't available. - Handling LIVE before CONFIG just seemed to be the norm for commands that I looked at, so I left it that way. Patch 6 (old patch 9) - Remove "name" (avoided the one comment from the review) John Ferlan (6): conf: Add new domain XML element 'iothreadids' qemu: Use domain iothreadids to IOThread's 'thread_id' Implement virDomainAddIOThread and virDomainDelIOThread remote: Add support for AddIOThread and DelIOThread qemu: Add support to Add/Delete IOThreads virsh: Add iothreadadd and iothreaddel commands docs/formatdomain.html.in | 30 ++ docs/schemas/domaincommon.rng | 12 + include/libvirt/libvirt-domain.h | 6 + src/conf/domain_audit.c | 9 + src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 190 ++++++++- src/conf/domain_conf.h | 16 + src/driver-hypervisor.h | 12 + src/libvirt-domain.c | 118 ++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 22 +- src/qemu/qemu_command.c | 38 +- src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 36 -- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_driver.c | 466 ++++++++++++++++++++- src/qemu/qemu_process.c | 37 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 30 +- src/remote_protocol-structs | 12 + .../qemuxml2argv-iothreads-ids-partial.args | 10 + .../qemuxml2argv-iothreads-ids-partial.xml | 33 ++ .../qemuxml2argv-iothreads-ids.args | 8 + .../qemuxml2argv-iothreads-ids.xml | 33 ++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 164 ++++++++ tools/virsh.pod | 31 ++ 29 files changed, 1239 insertions(+), 102 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml -- 2.1.0

2 13

[libvirt] [PATCH v2 0/2] QoS: Adapt to changing MAC
by Michal Privoznik 21 Apr '15

21 Apr '15

Diff to v1: - Laine's comments worked in Michal Privoznik (2): virDomainActualNetDefContentsFormat: Format class_id only for status XML processNicRxFilterChangedEvent: Take appropriate actions for NET_TYPE_NETWORK too src/conf/domain_conf.c | 3 ++- src/qemu/qemu_driver.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) -- 2.0.5

2 4

[libvirt] [PATCH] spec: If installing default network, reload libvirtd (bz 867546)
by Cole Robinson 21 Apr '15

21 Apr '15

If libvirt-daemon-config-network is installed while libvirtd is already running, the daemon needs to be restarted to pick up the change. Instead let's trigger a daemon reload when the package is first installed. Then the default network is available immediately if libvirtd was already running. https://bugzilla.redhat.com/show_bug.cgi?id=867546 --- libvirt.spec.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index e08c9e7..ada0257 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1770,6 +1770,14 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml + + # Make sure libvirt picks up the new network defininiton + %if %{with_systemd} + /bin/systemctl reload libvirtd.service >/dev/null 2>&1 ||: + %else + /sbin/service libvirtd reload > /dev/null 2>&1 || : + %endif + fi %endif -- 2.3.5

3 4

[libvirt] [PATCH] qemu: Always refresh capabilities if no <guests> found (bz 1000116)
by Cole Robinson 21 Apr '15

21 Apr '15

- Remove all qemu emulators - Restart libvirtd - Install qemu emulators - Call 'virsh version' -> errors The only thing that will force the qemu driver to refresh it's cached capablities info is an explict API call to GetCapabilities. However in the case when the initial caps lookup at driver connect didn't find a single qemu emulator to poll, the driver is effectively useless and really can't do anything until it's populated some qemu capabilities info. With the above steps, the user would have to either know about the magic refresh capabilities call, or restart libvirtd to pick up the changes. Instead, this patch changes things so that every time a part of th driver requests access to capabilities info, check to see if we've previously seen any emulators. If not, force a refresh. In the case of 'still no emulators found', this is still very quick, so I can't think of a downside. https://bugzilla.redhat.com/show_bug.cgi?id=1000116 --- src/qemu/qemu_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2cf3905..b662b69 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -965,6 +965,13 @@ virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver, qemuDriverLock(driver); } + if (driver->caps->nguests == 0 && !refresh) { + VIR_DEBUG("Capabilities didn't detect any guests. Forcing a " + "refresh."); + qemuDriverUnlock(driver); + return virQEMUDriverGetCapabilities(driver, true); + } + ret = virObjectRef(driver->caps); qemuDriverUnlock(driver); return ret; -- 2.3.5

2 2

[libvirt] [PATCH] vircapstest: fix build without LXC
by Roman Bogorodskiy 21 Apr '15

21 Apr '15

When building without lxc support enabled, build fails with: CLD vircapstest vircapstest.o: In function `test_virCapsDomainDataLookupLXC': vircapstest.c:(.text+0x9ef): undefined reference to `testLXCCapsInit' Fix that by hiding LXC tests under appropriate #ifdef. --- tests/vircapstest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 3e5038b..b2c321e 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -289,6 +289,7 @@ test_virCapsDomainDataLookupXen(const void *data ATTRIBUTE_UNUSED) return ret; } +#ifdef WITH_LXC static int test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) { @@ -311,6 +312,7 @@ test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) virObjectUnref(caps); return ret; } +#endif /* WITH_LXC */ static int mymain(void) @@ -326,9 +328,11 @@ mymain(void) if (virtTestRun("virCapsDomainDataLookupXen", test_virCapsDomainDataLookupXen, NULL) < 0) ret = -1; +#ifdef WITH_LXC if (virtTestRun("virCapsDomainDataLookupLXC", test_virCapsDomainDataLookupLXC, NULL) < 0) ret = -1; +#endif /* WITH_LXC */ return ret; } -- 2.3.5

2 1