- Devel - libvirt List Archives

[libvirt] [PATCH 00/17] qemu: Drop QEMU_CAPS_DEVICE part 2
by Cole Robinson 28 Jan '16

28 Jan '16

This is the second series dropping QEMU_CAPS_DEVICE. It handles qemu_command.c and all remaining uses of QEMU_CAPS_DEVICE. Every qemu binary after v0.12.1 has the -device option, but many platforms cannot actually use it, because they are based around hardcoded machine models that cannot be extended. For these machine types, old style options work in _some_ scenarios, basically only situations where we are specifying host side config, where modern machines would use -chardev and -netdev. Those code paths are already preserved for the only scenario that's actually been tested to work (qemu-system-arm -M vexpress and some other arm pieces), so they aren't going anywhere. But all other old style command line options can be dropped AFAICT. See individual patches for descriptions. Cole Robinson (17): qemu: domain: Consistently use goto in PostParse qemu: Validate type != xen at parse time qemu: command: Drop xen disk and vga handling qemu: command: Don't unset QEMU_CAPS_DEVICE for -drive sd qemu: Drop some simple uses of QEMU_CAPS_DEVICE qemu: command: Drop QEMU_CAPS_DEVICE for device aliases qemu: command: drop QEMU_CAPS_DEVICE for PCI address assign qemu: command: drop QEMU_CAPS_DEVICE for controller cli qemu: command: drop QEMU_CAPS_DEVICE for net cli qemu: command: drop QEMU_CAPS_DEVICE for serial/parallel cli qemu: command: drop QEMU_CAPS_DEVICE for watchdog cli qemu: command: drop QEMU_CAPS_DEVICE for video cli qemu: command: Drop QEMU_CAPS_DEVICE for USB qemu: command: Drop old style -soundhw usage qemu: zap QEMU_CAPS_BALLOON qemu: zap QEMU_CAPS_PCIDEVICE qemu: zap QEMU_CAPS_DEVICE src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 1137 ++++++++------------ src/qemu/qemu_domain.c | 20 +- src/qemu/qemu_hostdev.c | 4 +- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 - .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 45 - tests/qemuargv2xmltest.c | 1 - tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 - tests/qemuhelptest.c | 45 +- tests/qemuhotplugtest.c | 1 - .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 26 - tests/qemuxml2argvtest.c | 34 +- .../qemuxml2xmlout-disk-xenvbd.xml | 45 - tests/qemuxml2xmltest.c | 1 - 24 files changed, 476 insertions(+), 954 deletions(-) delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml -- 2.5.0

1 24

[libvirt] [PATCH] pci: Use bool return type for some virPCIDeviceGet*() functions
by Andrea Bolognani 28 Jan '16

28 Jan '16

The affected functions are: virPCIDeviceGetManaged() virPCIDeviceGetUnbindFromStub() virPCIDeviceGetRemoveSlot() virPCIDeviceGetReprobe() Change their return type from unsigned int to bool: the corresponding members in struct _virPCIDevice are defined as bool, and even the corresponding virPCIDeviceSet*() functions take a bool value as input so there's no point in these functions having unsigned int as return type. Suggested-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virpci.c | 8 ++++---- src/util/virpci.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 505c1f3..6554351 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1693,7 +1693,7 @@ void virPCIDeviceSetManaged(virPCIDevicePtr dev, bool managed) dev->managed = managed; } -unsigned int +bool virPCIDeviceGetManaged(virPCIDevicePtr dev) { return dev->managed; @@ -1711,7 +1711,7 @@ virPCIDeviceGetStubDriver(virPCIDevicePtr dev) return dev->stubDriver; } -unsigned int +bool virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev) { return dev->unbind_from_stub; @@ -1723,7 +1723,7 @@ virPCIDeviceSetUnbindFromStub(virPCIDevicePtr dev, bool unbind) dev->unbind_from_stub = unbind; } -unsigned int +bool virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev) { return dev->remove_slot; @@ -1735,7 +1735,7 @@ virPCIDeviceSetRemoveSlot(virPCIDevicePtr dev, bool remove_slot) dev->remove_slot = remove_slot; } -unsigned int +bool virPCIDeviceGetReprobe(virPCIDevicePtr dev) { return dev->reprobe; diff --git a/src/util/virpci.h b/src/util/virpci.h index d1ac942..5529b24 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -99,7 +99,7 @@ int virPCIDeviceReset(virPCIDevicePtr dev, void virPCIDeviceSetManaged(virPCIDevice *dev, bool managed); -unsigned int virPCIDeviceGetManaged(virPCIDevice *dev); +bool virPCIDeviceGetManaged(virPCIDevice *dev); void virPCIDeviceSetStubDriver(virPCIDevicePtr dev, virPCIStubDriver driver); virPCIStubDriver virPCIDeviceGetStubDriver(virPCIDevicePtr dev); @@ -110,13 +110,13 @@ int virPCIDeviceSetUsedBy(virPCIDevice *dev, void virPCIDeviceGetUsedBy(virPCIDevice *dev, const char **drv_name, const char **dom_name); -unsigned int virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); +bool virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); void virPCIDeviceSetUnbindFromStub(virPCIDevice *dev, bool unbind); -unsigned int virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev); +bool virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev); void virPCIDeviceSetRemoveSlot(virPCIDevice *dev, bool remove_slot); -unsigned int virPCIDeviceGetReprobe(virPCIDevicePtr dev); +bool virPCIDeviceGetReprobe(virPCIDevicePtr dev); void virPCIDeviceSetReprobe(virPCIDevice *dev, bool reprobe); void virPCIDeviceReattachInit(virPCIDevice *dev); -- 2.5.0

2 2

[libvirt] [PATCH 0/4] Some logical pool/volume changes
by John Ferlan 28 Jan '16

28 Jan '16

This series is a result of looking at Joe's comments : http://www.redhat.com/archives/libvir-list/2016-January/msg00403.html To an old series I posted and has been stuck on the bottom of a todo list regarding adding/using "thin" logical volumes: http://www.redhat.com/archives/libvir-list/2014-December/msg00706.html Joe's patch is refactord into two patches to do essentially the same thing, but add a bit more context/thoughts. The first two patches have no functional changes, just some comment changes and some code motion. The result of Joe's patches is that libvirt can find a thin logical volume if the libvirt pool looking at the containing volume group has a thin logical volume pool. Still to be done is the (cap)ability to create a thin logical volume pool and the thin logical volume(s) in the pool. Just figured it'd be easier to post some patches and to let discussion happen. Joe Harvell (2): logical: Remove need for 'segtype' field logical: Adjust regex for devices John Ferlan (2): logical: Fix comment examples for virStorageBackendLogicalFindLVs logical: Create helper virStorageBackendLogicalParseVolDevice src/storage/storage_backend_logical.c | 237 +++++++++++++++++++--------------- 1 file changed, 130 insertions(+), 107 deletions(-) -- 2.5.0

2 15

[libvirt] [PATCH] vz: remove unused struct field
by Mikhail Feoktistov 28 Jan '16

28 Jan '16

In commit 7039bb3c we have removed code that saves uuid to vzDomObj.uuid So this field is no longer needed. --- src/vz/vz_sdk.c | 5 ----- src/vz/vz_utils.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index d610979..5e4c4ac 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -413,7 +413,6 @@ prlsdkDomObjFreePrivate(void *p) PrlHandle_Free(pdom->sdkdom); PrlHandle_Free(pdom->cache.stats); virCondDestroy(&pdom->cache.cond); - VIR_FREE(pdom->uuid); VIR_FREE(pdom->home); VIR_FREE(p); }; @@ -1281,10 +1280,6 @@ prlsdkLoadDomain(vzConnPtr privconn, def->id = -1; - /* we will remove this field in the near future, so let's set it - * to NULL temporarily */ - pdom->uuid = NULL; - pdom->cache.stats = PRL_INVALID_HANDLE; pdom->cache.count = -1; if (virCondInit(&pdom->cache.cond) < 0) { diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index b7a4c81..417f821 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -76,7 +76,6 @@ typedef struct _vzCountersCache vzCountersCache; struct vzDomObj { int id; - char *uuid; char *home; PRL_HANDLE sdkdom; vzCountersCache cache; -- 1.8.3.1

1 1

[libvirt] [PATCH v6 0/7] Global domain cpu.cfs_period_us and cpu.cfs_quota_us setup
by Alexander Burluka 28 Jan '16

28 Jan '16

This patchset implements an ability to specify values for domain top level cpu.cfs_period_us and cpu.cfs_quota_us cgroups. These parameters are opt-in and named "global_period" and "global_quota". Introduction of these settings gives management applications further choice of controlling CPU usage. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Changes in v4: fix little rebase error Changes in v5: rebase to version 1.3.1 Changes in v6: remove unnecessary check Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 ++++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 68 ++++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 102 ++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 10 files changed, 251 insertions(+), 16 deletions(-) -- 1.8.3.1

1 8

[libvirt] [PATCH] gendispatch: Don't output spaces on empty line
by Michal Privoznik 28 Jan '16

28 Jan '16

In our generator for some code we put empty lines in the output to separate some blocks of code. However, in some cases we put couple of spaces on the empty line too. It's not bug, it just isn't nice. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/gendispatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 5cfc512..3740130 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -677,7 +677,7 @@ elsif ($mode eq "server") { push(@prepare_ret_list, "if (VIR_ALLOC($2_p) < 0)\n" . " goto cleanup;\n" . - " \n" . + "\n" . " if (VIR_STRDUP(*$2_p, $2) < 0)\n". " goto cleanup;\n"); -- 2.4.10

2 1

[libvirt] [PATCH] qemu: return -1 on error paths in qemuDomainSaveImageStartVM
by Nikolay Shirokovskiy 28 Jan '16

28 Jan '16

The error paths after fix suppose ret == -1 as at the beginning of the function. The better fix would be not to touch 'ret' at all until the end of the function where it is set to 0. Thus we'd better introduce some 'rc' variable to hold return values of called functions. --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 351e529..dfbf846 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6790,6 +6790,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virDomainAuditStart(vm, "restored", false); goto cleanup; } + ret = -1; event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, -- 1.8.3.1

2 2

[libvirt] Call for mentors and project ideas for Google Summer of Code 2016
by Stefan Hajnoczi 28 Jan '16

28 Jan '16

The QEMU wiki page for Google Summer of Code 2016 is now available here: http://qemu-project.org/Google_Summer_of_Code_2016 QEMU will apply for Google Summer of Code 2016 (https://g.co/gsoc/) If QEMU is accepted there will be funding for students to work on 12-week full-time open source projects remotely from May to August 2016. QEMU provides a mentor for each student who gives advice and evaluates their progress. If you have a project idea, especially if you are a regular contributor to QEMU and are willing to mentor this summer, please go to this wiki page and fill out the project idea template: http://qemu-project.org/Google_Summer_of_Code_2016 The project ideas list is part of the application so that QEMU can participate in GSoC. It's useful to have your project ideas on the wiki by February 8th 2016. If you have any questions about project ideas or QEMU applying to GSoC, please reply to this thread. Thanks, Stefan

2 4

[libvirt] [PATCH] util: fix build without macvtap
by Roman Bogorodskiy 27 Jan '16

27 Jan '16

Commit 370608b added new functions: - virNetDevMacVLanReleaseName, - virNetDevMacVLanReserveName. Add stubbed versions of them to fix build without macvtap. --- src/util/virnetdevmacvlan.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index da71eef..9293510 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1330,4 +1330,21 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UN _("Cannot create macvlan devices on this platform")); return -1; } + +int +virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED, + bool quietFail ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("The macvlan devices are not supported on this platform")); + return -1; +} + +int +virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("The macvlan devices are not supported on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ -- 2.4.6

3 3

[libvirt] [PATCH] Fix libvirtd free() segfault when migrating guest with deleted open vswitch port
by Jason J. Herne 27 Jan '16

27 Jan '16

libvirtd crashes on free()ing portData for an open vswitch port if that port was deleted. To reproduce: ovs-vsctl del-port vnet0 virsh migrate --live kvm1 qemu+ssh://dstHost/system Error message: libvirtd: *** Error in `/usr/sbin/libvirtd': free(): invalid pointer: 0x000003ff90001e20 *** The problem is that virCommandRun can return an empty string in the event that the port being queried does not exist. When this happens then we are unconditionally overwriting a newline character at position strlen()-1. When strlen is 0, we overwrite memory that does not belong to the string. The fix: Only overwrite the newline if the string is not empty. Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> --- src/util/virnetdevopenvswitch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 6780fb5..0f640d0 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -222,8 +222,10 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) goto cleanup; } - /* Wipeout the newline */ - (*migrate)[strlen(*migrate) - 1] = '\0'; + /* Wipeout the newline, if it exists */ + if (strlen(*migrate) > 0) { + (*migrate)[strlen(*migrate) - 1] = '\0'; + } ret = 0; cleanup: virCommandFree(cmd); -- 1.9.1

4 7

[libvirt] [PATCH] virnetdevmacvlan: Provide stubs for build without macvtap
by Michal Privoznik 27 Jan '16

27 Jan '16

In 370608b4c76f we have introduced two new internal APIs. However, there are no stubs for build without macvtap. Therefore build on systems lacking macvtap support (e.g. mingw or freebds) fails when trying to link. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/util/virnetdevmacvlan.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index da71eef..2409113 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1330,4 +1330,19 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UN _("Cannot create macvlan devices on this platform")); return -1; } + +int virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} + +int virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED, + bool quietFail ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ -- 2.4.10

1 0

[libvirt] high outage times for qemu virtio network links during live migration, trying to debug
by Chris Friesen 26 Jan '16

26 Jan '16

Hi, I'm using libvirt (1.2.12) with qemu (2.2.0) in the context of OpenStack. If I live-migrate a guest with virtio network interfaces, I see a ~1200msec delay in processing the network packets, and several hundred of them get dropped. I get the dropped packets, but I'm not sure why the delay is there. I instrumented qemu and libvirt, and the strange thing is that this delay seems to happen before qemu actually starts doing any migration-related work. (i.e. before qmp_migrate() is called) Looking at my timestamps, the start of the glitch seems to coincide with libvirtd calling qemuDomainMigratePrepareTunnel3Params(), and the end of the glitch occurs when the migration is complete and we're up and running on the destination. My question is, why doesn't qemu continue processing virtio packets while the dirty page scanning and memory transfer over the network is proceeding? Thanks, Chris (Please CC me on responses, I'm not subscribed to the lists.)

3 7

[libvirt] [PATCH] vircgroup: Finish renaming of virCgroupIsolateMount
by Michal Privoznik 26 Jan '16

26 Jan '16

In dc576025c360 we renamed virCgroupIsolateMount function to virCgroupBindMount. However, we forgot about one occurrence in section of the code which provides stubs for platforms without support for CGroups like *BSD for instance. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build-breaker and trivial rules. src/util/vircgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index d7f4065..9b56e27 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4882,9 +4882,9 @@ virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED, int -virCgroupIsolateMount(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *oldroot ATTRIBUTE_UNUSED, - const char *mountopts ATTRIBUTE_UNUSED) +virCgroupBindMount(virCgroupPtr group ATTRIBUTE_UNUSED, + const char *oldroot ATTRIBUTE_UNUSED, + const char *mountopts ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); -- 2.4.10

1 0

[libvirt] [PATCH v2 0/4] various test fixes and handling of input devices
by Pavel Hrdina 26 Jan '16

26 Jan '16

Some of the patches from v1 series are already pushed, only those 4 left for review. Pavel Hrdina (4): tests: use virtTestDifferenceFull in tests where we have output file tests: add some missing tests to qemuxml2xmltest device: cleanup input device code tests: update test XML files to follow input changes src/Makefile.am | 4 +- src/conf/domain_conf.c | 82 +++------------------- src/libxl/libxl_domain.c | 5 ++ src/qemu/qemu_domain.c | 23 ++++++ src/xen/xen_driver.c | 5 ++ src/xenapi/xenapi_driver.c | 5 ++ src/xenconfig/xen_common.c | 22 ++++++ src/xenconfig/xen_common.h | 2 + .../disk_snapshot_redefine.xml | 2 + .../external_vm_redefine.xml | 2 + tests/domainsnapshotxml2xmlout/full_domain.xml | 2 + tests/domainsnapshotxml2xmlout/metadata.xml | 2 + tests/domainsnapshotxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 2 +- tests/lxcconf2xmltest.c | 2 +- tests/nodedevxml2xmltest.c | 2 +- tests/qemuhotplugtest.c | 11 ++- .../qemuhotplug-hotplug-base+disk-scsi.xml | 2 + .../qemuhotplug-hotplug-base+disk-usb.xml | 2 + .../qemuhotplug-hotplug-base+disk-virtio.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 2 + .../qemuxml2argv-blkiotune-device.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 2 + .../qemuxml2argv-boot-menu-disable.xml | 2 + .../qemuxml2argv-boot-menu-enable-with-timeout.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 2 + .../qemuxml2argv-channel-guestfwd.xml | 2 + .../qemuxml2argv-channel-virtio.xml | 2 + .../qemuxml2argv-chardev-label.xml | 2 + .../qemuxml2argv-clock-catchup.xml | 2 + .../qemuxml2argv-clock-localtime.xml | 2 + .../qemuxml2argv-clock-timer-hyperv-rtc.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 + .../qemuxml2argv-console-compat.xml | 2 + .../qemuxml2argv-console-virtio-many.xml | 2 + .../qemuxml2argv-cpu-eoi-disabled.xml | 2 + .../qemuxml2argv-cpu-eoi-enabled.xml | 2 + .../qemuxml2argv-cpu-host-kvmclock.xml | 2 + .../qemuxml2argv-cpu-host-model-features.xml | 2 + .../qemuxml2argv-cpu-host-passthrough-features.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 2 + .../qemuxml2argv-cpu-numa-disjoint.xml | 2 + .../qemuxml2argv-cpu-numa-memshared.xml | 2 + ...xml2argv-cputune-iothreadsched-zeropriority.xml | 2 + .../qemuxml2argv-cputune-numatune.xml | 2 + .../qemuxml2argv-cputune-zero-shares.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + .../qemuxml2argv-disk-active-commit.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 2 + .../qemuxml2argv-disk-cdrom-empty.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 2 + .../qemuxml2argv-disk-copy_on_read.xml | 2 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 3 + .../qemuxml2argv-disk-drive-boot-disk.xml | 3 + .../qemuxml2argv-disk-drive-cache-directsync.xml | 2 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 + .../qemuxml2argv-disk-drive-copy-on-read.xml | 2 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 2 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 + ...rgv-disk-drive-error-policy-wreport-rignore.xml | 2 + .../qemuxml2argv-disk-drive-fat.xml | 2 + .../qemuxml2argv-disk-drive-fmt-qcow.xml | 2 + .../qemuxml2argv-disk-drive-network-gluster.xml | 2 + .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 2 + .../qemuxml2argv-disk-drive-network-iscsi.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-export.xml | 2 + ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 2 + ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd.xml | 2 + .../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 2 + .../qemuxml2argv-disk-scsi-device.xml | 2 + .../qemuxml2argv-disk-scsi-disk-vpd.xml | 2 + ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 + .../qemuxml2argv-disk-scsi-megasas.xml | 2 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 2 + .../qemuxml2argv-disk-scsi-vscsi.xml | 2 + .../qemuxml2argv-disk-source-pool-mode.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-max_sectors.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 + .../qemuxml2argv-encrypted-disk.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 + .../qemuxml2argv-floppy-drive-fat.xml | 2 + .../qemuxml2argv-hostdev-pci-address.xml | 2 + .../qemuxml2argv-hostdev-scsi-large-unit.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-rawio.xml | 2 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 2 + .../qemuxml2argv-hostdev-scsi-sgio.xml | 2 + .../qemuxml2argv-hostdev-scsi-shareable.xml | 2 + ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 2 + .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 2 + .../qemuxml2argv-hostdev-usb-address.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 2 + .../qemuxml2argv-hugepages-pages.xml | 2 + .../qemuxml2argv-hugepages-pages2.xml | 2 + .../qemuxml2argv-hugepages-pages3.xml | 2 + .../qemuxml2argv-hugepages-shared.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + .../qemuxml2argv-input-usbmouse.xml | 2 + .../qemuxml2argv-input-usbtablet.xml | 2 + .../qemuxml2argv-interface-driver.xml | 2 + .../qemuxml2argv-iothreads-disk.xml | 2 + .../qemuxml2argv-iothreads-ids-partial.xml | 2 + .../qemuxml2argv-iothreads-ids.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml | 2 + .../qemuxml2argv-kvm-features-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-kvm-features.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 2 + .../qemuxml2argv-machine-core-off.xml | 2 + .../qemuxml2argv-machine-core-on.xml | 2 + .../qemuxml2argv-memory-hotplug-dimm.xml | 2 + .../qemuxml2argv-memory-hotplug-nonuma.xml | 2 + .../qemuxml2argv-memory-hotplug.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 + .../qemuxml2argv-misc-disable-s3.xml | 2 + .../qemuxml2argv-misc-disable-suspends.xml | 2 + .../qemuxml2argv-misc-enable-s4.xml | 2 + .../qemuxml2argv-misc-no-reboot.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 + .../qemuxml2argv-net-eth-ifname.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 + .../qemuxml2argv-net-hostdev-vfio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-net-midonet.xml | 2 + .../qemuxml2argv-net-openvswitch.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-udp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 + .../qemuxml2argv-net-vhostuser.xml | 2 + .../qemuxml2argv-net-virtio-device.xml | 2 + .../qemuxml2argv-net-virtio-disable-offloads.xml | 2 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 + .../qemuxml2argv-nographics-vga.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 2 + .../qemuxml2argv-numad-static-vcpu-no-numatune.xml | 2 + .../qemuxml2argv-numatune-memnode-no-memory.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 2 + .../qemuxml2argv-panic-no-address.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + .../qemuxml2argv-pci-serial-dev-chardev.xml | 2 + .../qemuxml2argv-pcie-root-port-too-many.xml | 2 + .../qemuxml2argv-pcie-root-port.xml | 2 + .../qemuxml2argv-pcie-switch-downstream-port.xml | 2 + .../qemuxml2argv-pcie-switch-upstream-port.xml | 2 + .../qemuxml2argv-pcihole64-none.xml | 2 + .../qemuxml2argv-pcihole64-q35.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 2 + .../qemuxml2argv-pmu-feature-off.xml | 2 + .../qemuxml2argv-pv-spinlock-disabled.xml | 2 + .../qemuxml2argv-pv-spinlock-enabled.xml | 2 + .../qemuxml2argv-qemu-ns-no-env.xml | 2 + .../qemuxml2argv-reboot-timeout-disabled.xml | 2 + .../qemuxml2argv-reboot-timeout-enabled.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 + .../qemuxml2argv-seclabel-dac-none.xml | 2 + .../qemuxml2argv-seclabel-device-multiple.xml | 2 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 + .../qemuxml2argv-seclabel-dynamic-none.xml | 2 + .../qemuxml2argv-seclabel-dynamic-override.xml | 2 + .../qemuxml2argv-seclabel-static-labelskip.xml | 2 + .../qemuxml2argv-seclabel-static.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 + .../qemuxml2argv-serial-spiceport-nospice.xml | 2 + .../qemuxml2argv-serial-tcp-telnet.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 + .../qemuxml2argv-smbios-multiple-type2.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml | 2 + .../qemuxml2argv-tpm-passthrough.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 2 + .../qemuxml2argv-vcpu-placement-static.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 2 + .../qemuxml2argv-video-virtio-gpu-device.xml | 2 + .../qemuxml2argv-video-virtio-gpu-virgl.xml | 2 + .../qemuxml2argv-virtio-input-passthrough.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-virtio-input.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 + .../qemuxml2argv-virtio-rng-egd.xml | 2 + .../qemuxml2argv-virtio-rng-random.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 + tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-balloon-device-auto.xml | 2 + .../qemuxml2xmlout-balloon-device-period.xml | 2 + .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 2 + ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 2 + .../qemuxml2xmlout-channel-virtio-auto.xml | 2 + .../qemuxml2xmlout-channel-virtio-state-active.xml | 2 + ...emuxml2xmlout-channel-virtio-state-inactive.xml | 2 + .../qemuxml2xmlout-console-compat-auto.xml | 2 + .../qemuxml2xmlout-console-compat2.xml | 2 + .../qemuxml2xmlout-console-virtio.xml | 2 + .../qemuxml2xmlout-controller-usb-order.xml | 2 + .../qemuxml2xmlout-cpu-empty.xml | 2 + .../qemuxml2xmlout-cpu-numa-disordered.xml | 2 + .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 2 + .../qemuxml2xmlout-cpu-numa1.xml | 2 + .../qemuxml2xmlout-cpu-numa2.xml | 2 + .../qemuxml2xmlout-cputune-iothreads.xml | 2 + .../qemuxml2xmlout-cputune-iothreadsched.xml | 2 + .../qemuxml2xmlout-default-kvm-host-arch.xml | 2 + .../qemuxml2xmlout-default-qemu-host-arch.xml | 2 + .../qemuxml2xmlout-disk-backing-chains-active.xml | 2 + ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 2 + .../qemuxml2xmlout-disk-drive-discard.xml | 2 + .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 2 + .../qemuxml2xmlout-disk-mirror-old.xml | 2 + .../qemuxml2xmlout-disk-mirror.xml | 2 + .../qemuxml2xmlout-disk-scsi-device-auto.xml | 2 + .../qemuxml2xmlout-disk-source-pool.xml | 2 + ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 2 + .../qemuxml2xmlout-memtune-unlimited.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 2 + .../qemuxml2xmlout-metadata-duplicate.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 + ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 2 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 2 + .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 2 + .../qemuxml2xmlout-numatune-auto-prefer.xml | 2 + .../qemuxml2xmlout-numatune-memnode.xml | 2 + tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 2 + .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 + .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 + .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 + .../qemuxml2xmlout-pcie-root.xml | 2 + .../qemuxml2xmlout-pcihole64-gib.xml | 2 + .../qemuxml2xmlout-pmu-feature.xml | 2 + tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 + .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 2 + .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 2 + .../qemuxml2xmlout-seclabel-none.xml | 2 + .../qemuxml2xmlout-serial-target-port-auto.xml | 2 + .../qemuxml2xmlout-tap-vhost-incorrect.xml | 2 + .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 2 + .../qemuxml2xmlout-usb-redir-filter-version.xml | 2 + .../qemuxml2xmlout-usb-redir-filter.xml | 2 + tests/qemuxml2xmltest.c | 23 ++++++ tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 + tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 + .../sexpr2xml-disk-block-shareable.xml | 2 + tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 + .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 + .../sexpr2xml-disk-drv-blktap-raw.xml | 2 + .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 + tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 + .../sexpr2xml-pv-bootloader-cmdline.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 + tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 2 - tests/xlconfigdata/test-paravirt-maxvcpus.xml | 2 + tests/xmconfigdata/test-paravirt-maxvcpus.xml | 2 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 + 303 files changed, 684 insertions(+), 85 deletions(-) -- 2.7.0

2 9

[libvirt] [PATCH] lxc: don't try to hide parent cgroups inside container
by Daniel P. Berrange 26 Jan '16

26 Jan '16

On the host when we start a container, it will be placed in a cgroup path of /machine.slice/machine-lxc\x2ddemo.scope under /sys/fs/cgroup/* Inside the containers' namespace we need to setup /sys/fs/cgroup mounts, and currently will bind mount /machine.slice/machine-lxc\x2ddemo.scope on the host to appear as / in the container. While this may sound nice, it confuses applications dealing with cgroups, because /proc/$PID/cgroup now does not match the directory in /sys/fs/cgroup This particularly causes problems for systems and will make it create repeated path components in the cgroup for apps run in the container eg /machine.slice/machine-lxc\x2ddemo.scope/machine.slice/machine-lxc\x2ddemo.scope/user.slice/user-0.slice/session-61.scope This also causes any systemd service that uses sd-notify to fail to start, because when systemd receives the notification it won't be able to identify the corresponding unit it came from. In particular this break rabbitmq-server startup Future kernels will provide proper cgroup namespacing which will handle this problem, but until that time we should not try to play games with hiding parent cgroups. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 2 +- src/lxc/lxc_container.c | 2 +- src/util/vircgroup.c | 9 ++++----- src/util/vircgroup.h | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5e05a98..1732421 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1194,6 +1194,7 @@ virCgroupAllowDevice; virCgroupAllowDeviceMajor; virCgroupAllowDevicePath; virCgroupAvailable; +virCgroupBindMount; virCgroupControllerAvailable; virCgroupControllerTypeFromString; virCgroupControllerTypeToString; @@ -1231,7 +1232,6 @@ virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; virCgroupHasController; virCgroupHasEmptyTasks; -virCgroupIsolateMount; virCgroupKill; virCgroupKillPainfully; virCgroupKillRecursive; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c5a70a1..a6805ac 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1827,7 +1827,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Now we can re-mount the cgroups controllers in the * same configuration as before */ - if (virCgroupIsolateMount(cgroup, "/.oldroot/", sec_mount_options) < 0) + if (virCgroupBindMount(cgroup, "/.oldroot/", sec_mount_options) < 0) goto cleanup; /* Mounts /dev */ diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 7584ee4..d7f4065 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3917,8 +3917,8 @@ virCgroupGetFreezerState(virCgroupPtr group, char **state) int -virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, - const char *mountopts) +virCgroupBindMount(virCgroupPtr group, const char *oldroot, + const char *mountopts) { int ret = -1; size_t i; @@ -3954,10 +3954,9 @@ virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, if (!virFileExists(group->controllers[i].mountPoint)) { char *src; - if (virAsprintf(&src, "%s%s%s", + if (virAsprintf(&src, "%s%s", oldroot, - group->controllers[i].mountPoint, - group->controllers[i].placement) < 0) + group->controllers[i].mountPoint) < 0) goto cleanup; VIR_DEBUG("Create mount point '%s'", diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 63a9e1c..d754b1f 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -286,9 +286,9 @@ int virCgroupKill(virCgroupPtr group, int signum); int virCgroupKillRecursive(virCgroupPtr group, int signum); int virCgroupKillPainfully(virCgroupPtr group); -int virCgroupIsolateMount(virCgroupPtr group, - const char *oldroot, - const char *mountopts); +int virCgroupBindMount(virCgroupPtr group, + const char *oldroot, + const char *mountopts); bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); -- 2.5.0

2 1

[libvirt] Compiling libvirt on Cygwin
by Maarten Jacobs 26 Jan '16

26 Jan '16

Hello, I have been trying to get libvirt compiled on Cygwin but I have run into a rather perplexing issue. I am running a 32-bit installation of Cygwin on Windows 10: CYGWIN_NT-10.0-WOW dell-desktop 2.4.0(0.293/5/3) 2016-01-15 16:14 i686 Cygwin I have had to "fix" a number of problems in the Makefile that prevented the code from linking properly. I am not sure if the fixes are entirely correct - but as long as the linker was ok I pressed on. After applying those changes to the Makefile, I ran into the following issue when creating libvirtd.exe: CCLD libvirtd.exe../src/.libs/libvirt_driver_remote.a(libvirt_net_rpc_la-virnetmessage.o): In function `virNetMessageNew':/home/maart/source/libvirt/src/rpc/virnetmessage.c:39: multiple definition of `virNetMessageNew'/home/maart/source/libvirt/src/.libs/libvirt.dll.a(d002143.o):(.text+0x0): first defined here...collect2: error: ld returned 1 exit statusMakefile:2152: recipe for target 'libvirtd.exe' failedmake[3]: *** [libvirtd.exe] Error 1make[3]: Leaving directory '/cygdrive/c/cygwin64/home/maart/source/libvirt/daemon'Makefile:2050: recipe for target 'all' failedmake[2]: *** [all] Error 2make[2]: Leaving directory '/cygdrive/c/cygwin64/home/maart/source/libvirt/daemon'Makefile:1993: recipe for target 'all-recursive' failedmake[1]: *** [all-recursive] Error 1make[1]: Leaving directory '/cygdrive/c/cygwin64/home/maart/source/libvirt'Makefile:1887: recipe for target 'all' failedmake: *** [all] Error 2 It appears to me that somehow when the executable is linked together, it finds two separate definitions of the virNetMessageNew method, however I cannot figure out how that could be. If anybody has any suggestions on how to debug this I'd appreciate it. For clarity: my aim is to get the code to compile first, whether or not it will actually work under Cygwin. I do not believe there should be a specific reason why this code could not be made to compile/link - even if the end result may not work as intended... But I hope to find that out once I successfully create the resulting executables. Thanks, Maarten Jacobs

2 2

[libvirt] [PATCH] qemu: turn on virtlockd by default
by Daniel P. Berrange 26 Jan '16

26 Jan '16

We have had virtlockd available for a long time now but have always defaulted to the 'nop' lock driver which does no locking. This gives users an unsafe deployment by default unless they know to turn on lockd. virtlockd will auto-activate via systemd when guests launch, so setting it on by default will only cause upgrade pain for people on non-systemd distros. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu.conf | 3 ++- src/qemu/qemu_driver.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 4fa5e8a..73f4a0a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -421,7 +421,8 @@ # share one writable disk, libvirt offers two approaches for # locking files. The first one is sanlock, the other one, # virtlockd, is then our own implementation. Accepted values -# are "sanlock" and "lockd". +# are "sanlock", "lockd" and "nop", with "lockd" being the +# default. # #lock_manager = "lockd" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e46404b..36fb047 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -728,7 +728,7 @@ qemuStateInitialize(bool privileged, if (!(qemu_driver->lockManager = virLockManagerPluginNew(cfg->lockManagerName ? - cfg->lockManagerName : "nop", + cfg->lockManagerName : "lockd", "qemu", cfg->configBaseDir, 0))) -- 2.5.0

4 7

[libvirt] [PATCH v2] qemu: add reporting of vCPU wait time
by Daniel P. Berrange 26 Jan '16

26 Jan '16

The VIR_DOMAIN_STATS_VCPU flag to virDomainListGetStats enables reporting of stats about vCPUs. Currently we only report the cumulative CPU running time and the execution state. This adds reporting of the wait time - time the vCPU wants to run, but the host schedular has something else running ahead of it. The data is reported per-vCPU eg $ virsh domstats --vcpu demo Domain: 'demo' vcpu.current=4 vcpu.maximum=4 vcpu.0.state=1 vcpu.0.time=1420000000 vcpu.0.wait=18403928 vcpu.1.state=1 vcpu.1.time=130000000 vcpu.1.wait=10612111 vcpu.2.state=1 vcpu.2.time=110000000 vcpu.2.wait=12759501 vcpu.3.state=1 vcpu.3.time=90000000 vcpu.3.wait=21825087 In implementing this I notice our reporting of CPU execute time has very poor granularity, since we are getting it from /proc/$PID/stat. As a future enhancement we should prefer to get CPU execute time from /proc/$PID/schedstat or /proc/$PID/sched (if either exist on the running kernel) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 36fb047..40c52d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1361,6 +1361,80 @@ static char *qemuConnectGetCapabilities(virConnectPtr conn) { static int +qemuGetSchedInfo(unsigned long long *cpuWait, + pid_t pid, pid_t tid) +{ + char *proc = NULL; + char *data = NULL; + char **lines = NULL; + size_t i; + int ret = -1; + double val; + + *cpuWait = 0; + + /* In general, we cannot assume pid_t fits in int; but /proc parsing + * is specific to Linux where int works fine. */ + if (tid) + ret = virAsprintf(&proc, "/proc/%d/task/%d/sched", (int)pid, (int)tid); + else + ret = virAsprintf(&proc, "/proc/%d/sched", (int)pid); + if (ret < 0) + goto cleanup; + ret = -1; + + /* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */ + if (access(proc, R_OK) < 0) + return 0; + + if (virFileReadAll(proc, (1<<16), &data) < 0) + goto cleanup; + + lines = virStringSplit(data, "\n", 0); + if (!lines) + goto cleanup; + + for (i = 0; lines[i] != NULL; i++) { + const char *line = lines[i]; + + /* Needs CONFIG_SCHEDSTATS. The second check + * is the old name the kernel used in past */ + if (STRPREFIX(line, "se.statistics.wait_sum") || + STRPREFIX(line, "se.wait_sum")) { + line = strchr(line, ':'); + if (!line) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing separate in sched info '%s'"), + lines[i]); + goto cleanup; + } + line++; + while (*line == ' ') + line++; + + if (virStrToDouble(line, NULL, &val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse sched info value '%s'"), + line); + goto cleanup; + } + + *cpuWait = (unsigned long long)(val * 1000000); + break; + } + } + + ret = 0; + + cleanup: + VIR_FREE(data); + VIR_FREE(proc); + VIR_FREE(lines); + return ret; +} + + +static int qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, pid_t pid, int tid) { @@ -1424,6 +1498,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, + unsigned long long *cpuwait, int maxinfo, unsigned char *cpumaps, int maplen) @@ -1476,6 +1551,11 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virBitmapFree(map); } + if (cpuwait) { + if (qemuGetSchedInfo(&(cpuwait[i]), vm->pid, vcpupid) < 0) + return -1; + } + ncpuinfo++; } @@ -5490,7 +5570,7 @@ qemuDomainGetVcpus(virDomainPtr dom, goto cleanup; } - ret = qemuDomainHelperGetVcpus(vm, info, maxinfo, cpumaps, maplen); + ret = qemuDomainHelperGetVcpus(vm, info, NULL, maxinfo, cpumaps, maplen); cleanup: virDomainObjEndAPI(&vm); @@ -19036,6 +19116,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int ret = -1; char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; virVcpuInfoPtr cpuinfo = NULL; + unsigned long long *cpuwait = NULL; if (virTypedParamsAddUInt(&record->params, &record->nparams, @@ -19051,10 +19132,12 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainDefGetVcpusMax(dom->def)) < 0) return -1; - if (VIR_ALLOC_N(cpuinfo, virDomainDefGetVcpus(dom->def)) < 0) - return -1; + if (VIR_ALLOC_N(cpuinfo, virDomainDefGetVcpus(dom->def)) < 0 || + VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) + goto cleanup; - if (qemuDomainHelperGetVcpus(dom, cpuinfo, virDomainDefGetVcpus(dom->def), + if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, + virDomainDefGetVcpus(dom->def), NULL, 0) < 0) { virResetLastError(); ret = 0; /* it's ok to be silent and go ahead */ @@ -19083,12 +19166,21 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, param_name, cpuinfo[i].cpuTime) < 0) goto cleanup; + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "vcpu.%zu.wait", i); + if (virTypedParamsAddULLong(&record->params, + &record->nparams, + maxparams, + param_name, + cpuwait[i]) < 0) + goto cleanup; } ret = 0; cleanup: VIR_FREE(cpuinfo); + VIR_FREE(cpuwait); return ret; } -- 2.5.0

2 1

[libvirt] [PATCH] qemu: qemuDomainRename and virDomainObjListNumOfDomains ABBA deadlock fix
by Maxim Nestratov 26 Jan '16

26 Jan '16

A pretty nasty deadlock occurs while trying to rename a VM in parallel with virDomainObjListNumOfDomains. The short description of the problem is as follows: Thread #1: qemuDomainRename: ------> aquires domain lock by qemuDomObjFromDomain ---------> waits for domain list lock in any of the listed functions: - virDomainObjListFindByName - virDomainObjListRenameAddNew - virDomainObjListRenameRemove Thread #2: virDomainObjListNumOfDomains: ------> aquires domain list lock ---------> waits for domain lock in virDomainObjListCount The patch establishes a single order of taking locks: driver->domains list first, then a particular VM. This is done by implementing a set of virDomainObjListXxxLocked functions working with driver->domains that assume that list lock is already aquired by calling functions. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/conf/virdomainobjlist.c | 74 +++++++++++++++++++++++++++++++++++++-------- src/conf/virdomainobjlist.h | 9 ++++++ src/libvirt_private.syms | 4 +++ src/qemu/qemu_driver.c | 40 +++++++++++++++++++++--- 4 files changed, 110 insertions(+), 17 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 7568f93..89e28a8 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -132,21 +132,19 @@ virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, static virDomainObjPtr -virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, +virDomainObjListFindByUUIDInternalLocked(virDomainObjListPtr doms, const unsigned char *uuid, bool ref) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObjPtr obj; - virObjectLock(doms); virUUIDFormat(uuid, uuidstr); obj = virHashLookup(doms->objs, uuidstr); - if (ref) { + if (ref) virObjectRef(obj); - virObjectUnlock(doms); - } + if (obj) { virObjectLock(obj); if (obj->removing) { @@ -156,8 +154,19 @@ virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, obj = NULL; } } - if (!ref) - virObjectUnlock(doms); + return obj; +} + +static virDomainObjPtr +virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, + const unsigned char *uuid, + bool ref) +{ + virDomainObjPtr obj; + + virObjectLock(doms); + obj = virDomainObjListFindByUUIDInternalLocked(doms, uuid, ref); + virObjectUnlock(doms); return obj; } @@ -169,6 +178,13 @@ virDomainObjListFindByUUID(virDomainObjListPtr doms, return virDomainObjListFindByUUIDInternal(doms, uuid, false); } +virDomainObjPtr +virDomainObjListFindByUUIDRefLocked(virDomainObjListPtr doms, + const unsigned char *uuid) +{ + return virDomainObjListFindByUUIDInternalLocked(doms, uuid, true); +} + virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, @@ -177,6 +193,23 @@ virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, return virDomainObjListFindByUUIDInternal(doms, uuid, true); } +virDomainObjPtr virDomainObjListFindByNameLocked(virDomainObjListPtr doms, + const char *name) +{ + virDomainObjPtr obj; + + obj = virHashLookup(doms->objsName, name); + virObjectRef(obj); + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + virObjectUnref(obj); + obj = NULL; + } + } + return obj; +} virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, const char *name) @@ -312,14 +345,12 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, return ret; } - int -virDomainObjListRenameAddNew(virDomainObjListPtr doms, +virDomainObjListRenameAddNewLocked(virDomainObjListPtr doms, virDomainObjPtr vm, const char *name) { int ret = -1; - virObjectLock(doms); /* Add new name into the hash table of domain names. */ if (virHashAddEntry(doms->objsName, name, vm) < 0) @@ -332,21 +363,38 @@ virDomainObjListRenameAddNew(virDomainObjListPtr doms, ret = 0; cleanup: + return ret; +} + +int +virDomainObjListRenameAddNew(virDomainObjListPtr doms, + virDomainObjPtr vm, + const char *name) +{ + int ret = -1; + virObjectLock(doms); + ret = virDomainObjListRenameAddNewLocked(doms, vm, name); virObjectUnlock(doms); return ret; } +int +virDomainObjListRenameRemoveLocked(virDomainObjListPtr doms, const char *name) +{ + virHashRemoveEntry(doms->objsName, name); + return 0; +} int virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name) { + int ret; virObjectLock(doms); - virHashRemoveEntry(doms->objsName, name); + ret = virDomainObjListRenameRemoveLocked(doms, name); virObjectUnlock(doms); - return 0; + return ret; } - /* * The caller must hold a lock on the driver owning 'doms', * and must also have locked 'dom', to ensure no one else diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index f479598..bca31cf 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -38,8 +38,12 @@ virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, const unsigned char *uuid); +virDomainObjPtr virDomainObjListFindByUUIDRefLocked(virDomainObjListPtr doms, + const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, const char *name); +virDomainObjPtr virDomainObjListFindByNameLocked(virDomainObjListPtr doms, + const char *name); enum { VIR_DOMAIN_OBJ_LIST_ADD_LIVE = (1 << 0), @@ -54,8 +58,13 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, int virDomainObjListRenameAddNew(virDomainObjListPtr doms, virDomainObjPtr vm, const char *name); +int virDomainObjListRenameAddNewLocked(virDomainObjListPtr doms, + virDomainObjPtr vm, + const char *name); int virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name); +int virDomainObjListRenameRemoveLocked(virDomainObjListPtr doms, + const char *name); void virDomainObjListRemove(virDomainObjListPtr doms, virDomainObjPtr dom); void virDomainObjListRemoveLocked(virDomainObjListPtr doms, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5e05a98..b05d6cc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -881,8 +881,10 @@ virDomainObjListConvert; virDomainObjListExport; virDomainObjListFindByID; virDomainObjListFindByName; +virDomainObjListFindByNameLocked; virDomainObjListFindByUUID; virDomainObjListFindByUUIDRef; +virDomainObjListFindByUUIDRefLocked; virDomainObjListForEach; virDomainObjListGetActiveIDs; virDomainObjListGetInactiveNames; @@ -892,7 +894,9 @@ virDomainObjListNumOfDomains; virDomainObjListRemove; virDomainObjListRemoveLocked; virDomainObjListRenameAddNew; +virDomainObjListRenameAddNewLocked; virDomainObjListRenameRemove; +virDomainObjListRenameRemoveLocked; # cpu/cpu.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e46404b..b012516 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -206,6 +206,36 @@ struct qemuAutostartData { virConnectPtr conn; }; +/** + * qemuDomObjFromDomainLocked: + * @domain: Domain pointer that has to be looked up + * + * This function looks up @domain and returns the appropriate virDomainObjPtr + * that has to be released by calling virDomainObjEndAPI(). + * It assumes that driver->domains list is locked already, thus it uses Locked + * variant of virDomainObjListFindByUUIDRef function. + * + * Returns the domain object with incremented reference counter which is locked + * on success, NULL otherwise. + */ +static virDomainObjPtr +qemuDomObjFromDomainLocked(virDomainPtr domain) +{ + virDomainObjPtr vm; + virQEMUDriverPtr driver = domain->conn->privateData; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + vm = virDomainObjListFindByUUIDRefLocked(driver->domains, domain->uuid); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, domain->name); + return NULL; + } + + return vm; +} /** * qemuDomObjFromDomain: @@ -19892,7 +19922,8 @@ static int qemuDomainRename(virDomainPtr dom, virCheckFlags(0, ret); - if (!(vm = qemuDomObjFromDomain(dom))) + virObjectLock(driver->domains); + if (!(vm = qemuDomObjFromDomainLocked(dom))) goto cleanup; if (virDomainRenameEnsureACL(dom->conn, vm->def) < 0) @@ -19938,7 +19969,7 @@ static int qemuDomainRename(virDomainPtr dom, * internal error. And since new_name != name here, there's no * deadlock imminent. */ - tmp_dom = virDomainObjListFindByName(driver->domains, new_name); + tmp_dom = virDomainObjListFindByNameLocked(driver->domains, new_name); if (tmp_dom) { virObjectUnlock(tmp_dom); virObjectUnref(tmp_dom); @@ -19956,7 +19987,7 @@ static int qemuDomainRename(virDomainPtr dom, goto endjob; } - if (virDomainObjListRenameAddNew(driver->domains, vm, new_name) < 0) + if (virDomainObjListRenameAddNewLocked(driver->domains, vm, new_name) < 0) goto endjob; event_old = virDomainEventLifecycleNewFromObj(vm, @@ -19980,7 +20011,7 @@ static int qemuDomainRename(virDomainPtr dom, } /* Remove old domain name from table. */ - virDomainObjListRenameRemove(driver->domains, old_dom_name); + virDomainObjListRenameRemoveLocked(driver->domains, old_dom_name); event_new = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, @@ -20000,6 +20031,7 @@ static int qemuDomainRename(virDomainPtr dom, qemuDomainEventQueue(driver, event_old); qemuDomainEventQueue(driver, event_new); virObjectUnref(cfg); + virObjectUnlock(driver->domains); return ret; rollback: -- 1.8.3.1

4 7

[libvirt] Ability to add arbitrary data to snapshots
by Alexander Burluka 26 Jan '16

26 Jan '16

Hello! Currently our Virtuozzo company is working on some kind of management tool for libvirt. We encountered some problems with snapshots while development. So I would like to ask community a few questions: 1) Would you mind if I extend current libvirt snapshot with ability to add arbitrary data (blob or some config files)? 2) Would this feature be useful for your users? I see it as something like: virsh snapshot-create VM1 --blob /path/to/some-file virsh snapshot-revert VM1 <number> and /path/to/some-file appeared again. Looking forward for your comments and help. Thanks! -- Regards, Alexander Burluka

3 7

[libvirt] [PATCH v2] virsh: improve waiting for block job readiness
by Michael Chapman 26 Jan '16

26 Jan '16

After a block job hits 100%, we only need to apply a timeout waiting for a block job event if exactly one of the BLOCK_JOB or BLOCK_JOB_2 callbacks were able to be registered. If neither callback could be registered, there's clearly no need for a timeout. If both callbacks were registered, then we're guaranteed to eventually get one of the events. The path being used by virsh must be exactly the source path or target device in the domain's disk definition, and these are the respective strings sent back in these two events. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- v1 discussion at: http://www.redhat.com/archives/libvir-list/2016-January/msg00031.html Changes since v1: - Fixed bugs in cb_id/cb_id2 conditionals - Consistently used break to exit loop, dropped cleanup label - Clarified the logic and behaviour in comments - Improved commit message tools/virsh-domain.c | 60 ++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index edbbc34..853416c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1875,14 +1875,17 @@ virshBlockJobWaitFree(virshBlockJobWaitDataPtr data) * virshBlockJobWait: * @data: private data initialized by virshBlockJobWaitInit * - * Waits for the block job to complete. This function prefers to get an event - * from libvirt but still has fallback means if the device name can't be matched + * Waits for the block job to complete. This function prefers to wait for a + * matching VIR_DOMAIN_EVENT_ID_BLOCK_JOB or VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 + * event from libvirt, however it has a fallback mode should either of these + * events not be available. * - * This function returns values from the virConnectDomainEventBlockJobStatus enum - * or -1 in case of a internal error. Fallback states if a block job vanishes - * without triggering the event is VIR_DOMAIN_BLOCK_JOB_COMPLETED. For two phase - * jobs after the retry count for waiting for the event expires is - * VIR_DOMAIN_BLOCK_JOB_READY. + * This function returns values from the virConnectDomainEventBlockJobStatus + * enum or -1 in case of a internal error. + * + * If the fallback mode is activated the returned event is + * VIR_DOMAIN_BLOCK_JOB_COMPLETED if the block job vanishes, or + * VIR_DOMAIN_BLOCK_JOB_READY if the block job reaches 100%. */ static int virshBlockJobWait(virshBlockJobWaitDataPtr data) @@ -1932,28 +1935,32 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (result < 0) { vshError(data->ctl, _("failed to query job for disk %s"), data->dev); - goto cleanup; + break; } - /* if we've got an event for the device we are waiting for we can end - * the waiting loop */ + /* If either callback could be registered and we've got an event, we can + * can end the waiting loop */ if ((data->cb_id >= 0 || data->cb_id2 >= 0) && data->status != -1) { ret = data->status; - goto cleanup; + break; } - /* since virsh can't guarantee that the path provided by the user will - * later be matched in the event we will need to keep the fallback - * approach and claim success if the block job finishes or vanishes. */ - if (result == 0) - break; + /* Fallback behaviour is only needed if one or both callbacks could not + * be registered */ + if (data->cb_id < 0 || data->cb_id2 < 0) { + /* If the block job vanishes, synthesize a COMPLETED event */ + if (result == 0) { + ret = VIR_DOMAIN_BLOCK_JOB_COMPLETED; + break; + } - /* for two-phase jobs we will try to wait in the synchronized phase - * for event arrival since 100% completion doesn't necessarily mean that - * the block job has finished and can be terminated with success */ - if (info.end == info.cur && --retries == 0) { - ret = VIR_DOMAIN_BLOCK_JOB_READY; - goto cleanup; + /* If the block job hits 100%, wait a little while for a possible + * event from libvirt, else synthesize our own READY event */ + if (info.end == info.cur && + ((data->cb_id < 0 && data->cb_id2 < 0) || --retries == 0)) { + ret = VIR_DOMAIN_BLOCK_JOB_READY; + break; + } } if (data->verbose) @@ -1962,26 +1969,23 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->timeout && virTimeMillisNow(&curr) < 0) { vshSaveLibvirtError(); - goto cleanup; + break; } if (intCaught || (data->timeout && (curr - start > data->timeout))) { if (virDomainBlockJobAbort(data->dom, data->dev, abort_flags) < 0) { vshError(data->ctl, _("failed to abort job for disk '%s'"), data->dev); - goto cleanup; + break; } ret = VIR_DOMAIN_BLOCK_JOB_CANCELED; - goto cleanup; + break; } usleep(500 * 1000); } - ret = VIR_DOMAIN_BLOCK_JOB_COMPLETED; - - cleanup: /* print 100% completed */ if (data->verbose && (ret == VIR_DOMAIN_BLOCK_JOB_COMPLETED || -- 2.4.3

2 2

[libvirt] [PATCH] virsh: fix cpu-stats command output format issue
by Luyao Huang 26 Jan '16

26 Jan '16

After commit 57177f1, the cpu-stats command format change to: CPU0: cpu_time 14401.507878990 seconds vcpu_time 14378732785511 vcpu_time is not user friendly. After this patch, it will change back: CPU0: cpu_time 14401.507878990 seconds vcpu_time 14378.732785511 seconds https://bugzilla.redhat.com/show_bug.cgi?id=1301807 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1089a4d..c2146d2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7243,6 +7243,7 @@ vshCPUStatsPrintField(vshControl *ctl, { vshPrint(ctl, "\t%-12s ", param->field); if ((STREQ(param->field, VIR_DOMAIN_CPU_STATS_CPUTIME) || + STREQ(param->field, VIR_DOMAIN_CPU_STATS_VCPUTIME) || STREQ(param->field, VIR_DOMAIN_CPU_STATS_USERTIME) || STREQ(param->field, VIR_DOMAIN_CPU_STATS_SYSTEMTIME)) && param->type == VIR_TYPED_PARAM_ULLONG) { -- 1.8.3.1

3 2

[libvirt] [PATCHv2] util: keep/use a bitmap of in-use macvtap devices
by Laine Stump 26 Jan '16

26 Jan '16

This patch creates two bitmaps, one for macvlan devicenames and one for macvtap. The bitmap position is used to indicate that libvirt is currently using a device with the name macvtap%d/macvlan%d, where %d is the position in the bitmap. When requested to create a new macvtap/macvlan device, libvirt will now look for the first clear bit in the appropriate bitmap and derive the device name from that rather than just starting at 0 and counting up until one works. When libvirtd is restarted, qemu calls the appropriate function to "re-reserve" the device names as it is scanning the status of running domains. Note that it may seem strange that the retry counter now starts at 8192 instead of 5. This is because we now don't do a "pre-check" for the existence of a device once we've reserved it in the bitmap - we move straight to creating it; although very unlikely, it's possible that someone has a running system where they have a large number of network devices *created outside libvirt* named "macvtap%d" or "macvlan%d" - such a setup would still allow creating more devices with the old code, while a low retry max in the new code would cause a failure. Since the objective of the retry max is just to prevent an infinite loop, and it's highly unlikely to do more than 1 iteration anyway, having a high max is a reasonable concession in order to prevent lots of new failures. --- Changes from V1: * combine virNetDevMacVLanReserveNextFreeID() and virNetDevMacVLanReserveID() * put "macvlan" or "macvtap" into the "unable to create [blah] device "%s" as appropriate * eliminate redundant message when all device names are in use. (Background info that doesn't need to be in commit log: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> had pointed out here: https://www.redhat.com/archives/libvir-list/2015-October/msg00877.html that libvirt takes a *very long time* to creat macvtap/macvlan devices when there are a lot of them already in use. This is because the algorithm simply starts at macvtap0 and iterates calling virNetDevExists() for each possible name until it finds a free one. He had said at the time that he had tried keeping track of in-use macvtap/macvlan numbers in a bitmap, and had returns start time for a domain by 1m46s (from 2m to 14s) when there were 82 macvtap devices already in use. There was also an implication that he would post some patches for this to the list but, like all of us, apparently got busy with something else. Last week I ran into a situation where libvirt had created a macvtap device for a domain, and the domain was still using it, but for some reason the kernel (2.6.32-something on RHEL6) had lost track of that macvtap device, so when libvirt was asked to create a new macvtap device for another domain, it found that name to be "unused", and created a new device. The device creation was successful, but 802.1Qbh negotion failed. This failure was possibly because of the re-use of the macvtap name, possibly not, but the only way to find out was to not re-use the name. So lacking Tony's patches, I made my own and am posting them here. ) src/libvirt_private.syms | 2 + src/qemu/qemu_process.c | 10 +- src/util/virnetdevmacvlan.c | 380 ++++++++++++++++++++++++++++++++++++-------- src/util/virnetdevmacvlan.h | 5 +- 4 files changed, 332 insertions(+), 65 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5e05a98..f08bd8c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1851,6 +1851,8 @@ virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanReleaseName; +virNetDevMacVLanReserveName; virNetDevMacVLanRestartWithVPortProfile; virNetDevMacVLanVPortProfileRegisterCallback; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d465b4f..31812f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1,7 +1,7 @@ /* * qemu_process.c: QEMU process management * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3161,6 +3161,14 @@ qemuProcessNotifyNets(virDomainDefPtr def) for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; + /* keep others from trying to use the macvtap device name, but + * don't return error if this happens, since that causes the + * domain to be unceremoniously killed, which would be *very* + * impolite. + */ + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) + ignore_value(virNetDevMacVLanReserveName(net->ifname, false)); + if (networkNotifyActualDevice(def, net) < 0) return -1; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 98da009..fd168b7 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright (C) 2010-2012 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -64,6 +64,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST, # include "virnetlink.h" # include "virnetdev.h" # include "virpidfile.h" +# include "virbitmap.h" VIR_LOG_INIT("util.netdevmacvlan"); @@ -73,7 +74,225 @@ VIR_LOG_INIT("util.netdevmacvlan"); # define MACVLAN_NAME_PREFIX "macvlan" # define MACVLAN_NAME_PATTERN "macvlan%d" +# define MACVLAN_MAX_ID 8191 + virMutex virNetDevMacVLanCreateMutex = VIR_MUTEX_INITIALIZER; +virBitmapPtr macvtapIDs = NULL; +virBitmapPtr macvlanIDs = NULL; + +static int +virNetDevMacVLanOnceInit(void) +{ + + if (!macvtapIDs && + !(macvtapIDs = virBitmapNew(MACVLAN_MAX_ID + 1))) + return -1; + if (!macvlanIDs && + !(macvlanIDs = virBitmapNew(MACVLAN_MAX_ID + 1))) + return -1; + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virNetDevMacVLan); + + +/** + * virNetDevMacVLanReserveID: + * + * @id: id 0 - MACVLAN_MAX_ID+1 to reserve (or -1 for "first free") + * @flags: set VIR_NETDEV_MACVLAN_CREATE_WITH_TAP for macvtapN else macvlanN + * @quietFail: don't log an error if this name is already in-use + * @nextFree: reserve the next free ID *after* @id rather than @id itself + * + * Reserve the indicated ID in the appropriate bitmap, or find the + * first free ID if @id is -1. + * + * returns id or -1 to indicate failure + */ +static int +virNetDevMacVLanReserveID(int id, unsigned int flags, + bool quietFail, bool nextFree) +{ + virBitmapPtr bitmap; + + if (virNetDevMacVLanInitialize() < 0) + return -1; + + bitmap = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + macvtapIDs : macvlanIDs; + + if (id > MACVLAN_MAX_ID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("can't use name %s%d - out of range 0-%d"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, + id, MACVLAN_MAX_ID); + return -1; + } + + if ((id < 0 || nextFree) && + (id = virBitmapNextClearBit(bitmap, 0)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("no unused %s names available"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX); + return -1; + } + + if (virBitmapIsBitSet(bitmap, id)) { + if (quietFail) { + VIR_INFO("couldn't reserve name %s%d - already in use", + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't reserve name %s%d - already in use"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + } + return -1; + } + + if (virBitmapSetBit(bitmap, id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't mark %s%d as used"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + return -1; + } + + VIR_INFO("reserving device %s%d", + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + return id; +} + + +/** + * virNetDevMacVLanReleaseID: + * @id: id 0 - MACVLAN_MAX_ID+1 to release + * + * returns 0 for success or -1 for failure + */ +static int +virNetDevMacVLanReleaseID(int id, unsigned int flags) +{ + virBitmapPtr bitmap; + + if (virNetDevMacVLanInitialize() < 0) + return 0; + + bitmap = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + macvtapIDs : macvlanIDs; + + if (id > MACVLAN_MAX_ID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("can't free name %s%d - out of range 0-%d"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, + id, MACVLAN_MAX_ID); + return -1; + } + + if (id < 0) + return 0; + + VIR_INFO("releasing %sdevice %s%d", + virBitmapIsBitSet(bitmap, id) ? "" : "unreserved", + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + + if (virBitmapClearBit(bitmap, id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't mark %s%d as unused"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + return -1; + } + return 0; +} + + +/** + * virNetDevMacVLanReserveName: + * + * @name: already-known name of device + * @quietFail: don't log an error if this name is already in-use + * + * Extract the device type and id from a macvtap/macvlan device name + * and mark the appropriate position as in-use in the appropriate + * bitmap. + * + * returns 0 on success, -1 on failure, -2 if the name doesn't fit the auto-pattern + */ +int +virNetDevMacVLanReserveName(const char *name, bool quietFail) +{ + unsigned int id; + unsigned int flags = 0; + const char *idstr = NULL; + + if (virNetDevMacVLanInitialize() < 0) + return -1; + + if (STRPREFIX(name, MACVTAP_NAME_PREFIX)) { + idstr = name + strlen(MACVTAP_NAME_PREFIX); + flags |= VIR_NETDEV_MACVLAN_CREATE_WITH_TAP; + } else if (STRPREFIX(name, MACVLAN_NAME_PREFIX)) { + idstr = name + strlen(MACVLAN_NAME_PREFIX); + } else { + return -2; + } + + if (virStrToLong_ui(idstr, NULL, 10, &id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't get id value from macvtap device name %s"), + name); + return -1; + } + return virNetDevMacVLanReserveID(id, flags, quietFail, false); +} + + +/** + * virNetDevMacVLanReleaseName: + * + * @name: already-known name of device + * + * Extract the device type and id from a macvtap/macvlan device name + * and mark the appropriate position as in-use in the appropriate + * bitmap. + * + * returns 0 on success, -1 on failure + */ +int +virNetDevMacVLanReleaseName(const char *name) +{ + unsigned int id; + unsigned int flags = 0; + const char *idstr = NULL; + + if (virNetDevMacVLanInitialize() < 0) + return -1; + + if (STRPREFIX(name, MACVTAP_NAME_PREFIX)) { + idstr = name + strlen(MACVTAP_NAME_PREFIX); + flags |= VIR_NETDEV_MACVLAN_CREATE_WITH_TAP; + } else if (STRPREFIX(name, MACVLAN_NAME_PREFIX)) { + idstr = name + strlen(MACVLAN_NAME_PREFIX); + } else { + return 0; + } + + if (virStrToLong_ui(idstr, NULL, 10, &id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't get id value from macvtap device name %s"), + name); + return -1; + } + return virNetDevMacVLanReleaseID(id, flags); +} + /** * virNetDevMacVLanCreate: @@ -724,14 +943,20 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, * virNetDevMacVLanCreateWithVPortProfile: * Create an instance of a macvtap device and open its tap character * device. - * @tgifname: Interface name that the macvtap is supposed to have. May - * be NULL if this function is supposed to choose a name + + * @ifnameRequested: Interface name that the caller wants the macvtap + * device to have, or NULL to pick the first available name + * appropriate for the type (macvlan%d or macvtap%d). If the + * suggested name fits one of those patterns, but is already in + * use, we will fallback to finding the first available. If the + * suggested name *doesn't* fit a pattern and the name is in use, + * we will fail. * @macaddress: The MAC address for the macvtap device * @linkdev: The interface name of the NIC to connect to the external bridge - * @mode: int describing the mode for 'bridge', 'vepa', 'private' or 'passthru'. + * @mode: macvtap mode (VIR_NETDEV_MACVLAN_MODE_(BRIDGE|VEPA|PRIVATE|PASSTHRU) * @vmuuid: The UUID of the VM the macvtap belongs to * @virtPortProfile: pointer to object holding the virtual port profile data - * @res_ifname: Pointer to a string pointer where the actual name of the + * @ifnameResult: Pointer to a string pointer where the actual name of the * interface will be stored into if everything succeeded. It is up * to the caller to free the string. * @tapfd: array of file descriptor return value for the new tap device @@ -744,39 +969,36 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, * * Return 0 on success, -1 on error. */ -int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, - const virMacAddr *macaddress, - const char *linkdev, - virNetDevMacVLanMode mode, - const unsigned char *vmuuid, - virNetDevVPortProfilePtr virtPortProfile, - char **res_ifname, - virNetDevVPortProfileOp vmOp, - char *stateDir, - int *tapfd, - size_t tapfdSize, - unsigned int flags) +int +virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, + const virMacAddr *macaddress, + const char *linkdev, + virNetDevMacVLanMode mode, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + char **ifnameResult, + virNetDevVPortProfileOp vmOp, + char *stateDir, + int *tapfd, + size_t tapfdSize, + unsigned int flags) { const char *type = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? "macvtap" : "macvlan"; - const char *prefix = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? - MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX; const char *pattern = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? MACVTAP_NAME_PATTERN : MACVLAN_NAME_PATTERN; - int c, rc; + int rc, reservedID = -1; char ifname[IFNAMSIZ]; int retries, do_retry = 0; uint32_t macvtapMode; - const char *cr_ifname = NULL; + const char *ifnameCreated = NULL; int ret; int vf = -1; bool vnet_hdr = flags & VIR_NETDEV_MACVLAN_VNET_HDR; macvtapMode = modeMap[mode]; - *res_ifname = NULL; - - VIR_DEBUG("%s: VM OPERATION: %s", __FUNCTION__, virNetDevVPortProfileOpTypeToString(vmOp)); + *ifnameResult = NULL; /** Note: When using PASSTHROUGH mode with MACVTAP devices the link * device's MAC address must be set to the VMs MAC address. In @@ -803,52 +1025,82 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, } } - if (tgifname) { - if ((ret = virNetDevExists(tgifname)) < 0) - return -1; + if (ifnameRequested) { + bool isAutoName + = (STRPREFIX(ifnameRequested, MACVTAP_NAME_PREFIX) || + STRPREFIX(ifnameRequested, MACVLAN_NAME_PREFIX)); + + VIR_INFO("Requested macvtap device name: %s", ifnameRequested); + virMutexLock(&virNetDevMacVLanCreateMutex); + if ((ret = virNetDevExists(ifnameRequested)) < 0) { + virMutexUnlock(&virNetDevMacVLanCreateMutex); + return -1; + } if (ret) { - if (STRPREFIX(tgifname, prefix)) + if (isAutoName) goto create_name; virReportSystemError(EEXIST, - _("Unable to create macvlan device %s"), tgifname); + _("Unable to create %s device %s"), + type, ifnameRequested); + virMutexUnlock(&virNetDevMacVLanCreateMutex); return -1; } - cr_ifname = tgifname; - rc = virNetDevMacVLanCreate(tgifname, type, macaddress, linkdev, - macvtapMode, &do_retry); - if (rc < 0) + if (isAutoName && + (reservedID = virNetDevMacVLanReserveName(ifnameRequested, true)) < 0) { + reservedID = -1; + goto create_name; + } + + if (virNetDevMacVLanCreate(ifnameRequested, type, macaddress, + linkdev, macvtapMode, &do_retry) < 0) { + if (isAutoName) { + virNetDevMacVLanReleaseName(ifnameRequested); + reservedID = -1; + goto create_name; + } + virMutexUnlock(&virNetDevMacVLanCreateMutex); return -1; - } else { + } + /* virNetDevMacVLanCreate() was successful - use this name */ + ifnameCreated = ifnameRequested; create_name: - retries = 5; + virMutexUnlock(&virNetDevMacVLanCreateMutex); + } + + retries = MACVLAN_MAX_ID + 1; + while (!ifnameCreated && retries) { virMutexLock(&virNetDevMacVLanCreateMutex); - for (c = 0; c < 8192; c++) { - snprintf(ifname, sizeof(ifname), pattern, c); - if ((ret = virNetDevExists(ifname)) < 0) { - virMutexUnlock(&virNetDevMacVLanCreateMutex); + reservedID = virNetDevMacVLanReserveID(reservedID, flags, false, true); + if (reservedID < 0) { + virMutexUnlock(&virNetDevMacVLanCreateMutex); + return -1; + } + snprintf(ifname, sizeof(ifname), pattern, reservedID); + rc = virNetDevMacVLanCreate(ifname, type, macaddress, linkdev, + macvtapMode, &do_retry); + if (rc < 0) { + virNetDevMacVLanReleaseID(reservedID, flags); + virMutexUnlock(&virNetDevMacVLanCreateMutex); + if (!do_retry) return -1; - } - if (!ret) { - rc = virNetDevMacVLanCreate(ifname, type, macaddress, linkdev, - macvtapMode, &do_retry); - if (rc == 0) { - cr_ifname = ifname; - break; - } - - if (do_retry && --retries) - continue; - break; - } + VIR_INFO("Device %s wasn't reserved but already existed, skipping", + ifname); + retries--; + continue; } - + ifnameCreated = ifname; virMutexUnlock(&virNetDevMacVLanCreateMutex); - if (!cr_ifname) - return -1; } - if (virNetDevVPortProfileAssociate(cr_ifname, + if (!ifnameCreated) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Too many unreserved %s devices in use"), + type); + return -1; + } + + if (virNetDevVPortProfileAssociate(ifnameCreated, virtPortProfile, macaddress, linkdev, @@ -859,26 +1111,26 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, } if (flags & VIR_NETDEV_MACVLAN_CREATE_IFUP) { - if (virNetDevSetOnline(cr_ifname, true) < 0) { + if (virNetDevSetOnline(ifnameCreated, true) < 0) { rc = -1; goto disassociate_exit; } } if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) { - if (virNetDevMacVLanTapOpen(cr_ifname, tapfd, tapfdSize, 10) < 0) + if (virNetDevMacVLanTapOpen(ifnameCreated, tapfd, tapfdSize, 10) < 0) goto disassociate_exit; if (virNetDevMacVLanTapSetup(tapfd, tapfdSize, vnet_hdr) < 0) { VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ goto disassociate_exit; } - if (VIR_STRDUP(*res_ifname, cr_ifname) < 0) { + if (VIR_STRDUP(*ifnameResult, ifnameCreated) < 0) { VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ goto disassociate_exit; } } else { - if (VIR_STRDUP(*res_ifname, cr_ifname) < 0) + if (VIR_STRDUP(*ifnameResult, ifnameCreated) < 0) goto disassociate_exit; rc = 0; } @@ -889,7 +1141,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, * a saved image) - migration and libvirtd restart are handled * elsewhere. */ - if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + if (virNetDevMacVLanVPortProfileRegisterCallback(ifnameCreated, macaddress, linkdev, vmuuid, virtPortProfile, vmOp) < 0) @@ -899,7 +1151,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, return rc; disassociate_exit: - ignore_value(virNetDevVPortProfileDisassociate(cr_ifname, + ignore_value(virNetDevVPortProfileDisassociate(ifnameCreated, virtPortProfile, macaddress, linkdev, @@ -909,7 +1161,8 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, VIR_FORCE_CLOSE(tapfd[tapfdSize]); link_del_exit: - ignore_value(virNetDevMacVLanDelete(cr_ifname)); + ignore_value(virNetDevMacVLanDelete(ifnameCreated)); + virNetDevMacVLanReleaseName(ifnameCreated); return rc; } @@ -945,6 +1198,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ret = -1; if (virNetDevMacVLanDelete(ifname) < 0) ret = -1; + virNetDevMacVLanReleaseName(ifname); } if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) { diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 70e3b01..560593e 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2013 Red Hat, Inc. + * Copyright (C) 2011, 2013, 2016 Red Hat, Inc. * Copyright (C) 2010 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -50,6 +50,9 @@ typedef enum { VIR_NETDEV_MACVLAN_VNET_HDR = 1 << 2, } virNetDevMacVLanCreateFlags; +int virNetDevMacVLanReserveName(const char *name, bool quietfail); +int virNetDevMacVLanReleaseName(const char *name); + int virNetDevMacVLanCreate(const char *ifname, const char *type, const virMacAddr *macaddress, -- 2.5.0

2 3

[libvirt] [PATCH v5 0/7] Per domain bandwidth settings
by Alexander Burluka 26 Jan '16

26 Jan '16

We decide to make a global per domain bandwidth setting as were discussed in mailing list earlier. This patchset implements hierarchy top level cpu.cfs_period_us and cpu.cfs_quota_us control knob. I've named this parameters as global_period and global_quota. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Changes in v4: fix little rebase error Changes in v5: rebase to version 1.3.1 Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 ++++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 68 ++++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 102 ++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 10 files changed, 251 insertions(+), 16 deletions(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] Dont set ABI update flag during migration cookie parsing for persistent copy
by Shivaprasad G Bhat 26 Jan '16

26 Jan '16

The migration would fail if the checks in virDomainDefPostParseMemory() fail after ABI update. The ABI update normally done during the guest start and not during define. If someone is using --persistent with the virsh migrate it should be treated equivalent to domain define and not start. The furture restart would/should anyway do the ABI updates and flag correct errors. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 51e7125..39e259a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1284,8 +1284,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, } mig->persistent = virDomainDefParseNode(doc, nodes[0], caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!mig->persistent) { /* virDomainDefParseNode already reported * an error for us */

2 1

[libvirt] [PATCH 0/2] Couple of virt-host-validate fixes
by Michal Privoznik 25 Jan '16

25 Jan '16

While preparing my talk for DevConf, where I want to present this awesome tool I've found couple of bugs in it. Michal Privoznik (2): virt-host-validate: Check those CGroups that we actually use virt-host-validate: Fix error level for user namespace check tools/virt-host-validate-lxc.c | 18 +++++++++--------- tools/virt-host-validate-qemu.c | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.4.10

3 5

[libvirt] [PATCH] virsh: Correctly detect inserted media in change-media command
by Michal Privoznik 25 Jan '16

25 Jan '16

https://bugzilla.redhat.com/show_bug.cgi?id=1250331 It all works like this. The change-media command dumps domain XML, finds the corresponding cdrom device we want to change media in and returns it in the xmlNodePtr form. This way we don't have to bother with keeping all the subelements or attributes that we don't care about in the XML that is fed back to libvirt for the update API. Now, the problem is we try to be clever here and detect if disk already has a source (indicated by <source/> subelement). However, bare fact that the element is there does not mean disk has source. The element has some attributes and only if @file or @dev is within them disk has source. Any other attribute is meaningless for our purpose now. Make our clever check better. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d239ba8..8fb4204 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11055,6 +11055,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, char *device_type = NULL; char *ret = NULL; char *startupPolicy = NULL; + char *source_path = NULL; if (!disk_node) return NULL; @@ -11111,7 +11112,10 @@ virshUpdateDiskXML(xmlNodePtr disk_node, } if (source) { - if (type == VIRSH_UPDATE_DISK_XML_INSERT) { + if (!(source_path = virXMLPropString(source, "file"))) + source_path = virXMLPropString(source, "dev"); + + if (source_path && type == VIRSH_UPDATE_DISK_XML_INSERT) { vshError(NULL, _("The disk device '%s' already has media"), target); goto cleanup; } @@ -11170,6 +11174,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, cleanup: VIR_FREE(device_type); VIR_FREE(startupPolicy); + VIR_FREE(source_path); return ret; } -- 2.4.10

2 6

[libvirt] [PATCH 0/4] vz: rework domain creation
by Mikhail Feoktistov 25 Jan '16

25 Jan '16

Patch 1 and 2: Fix race condition when adding domain to domains list Race condition: User calls defineXML to create new instance. The main thread from vzDomainDefineXMLFlags() creates new instance by prlsdkCreateVm. Then this thread calls prlsdkAddDomain to add new domain to domains list. The second thread receives notification from hypervisor that new VM was created. It calls prlsdkHandleVmAddedEvent() and also tries to add new domain to domains list. These two threads call virDomainObjListFindByUUID() from prlsdkAddDomain() and don't find new domain. So they add two domains with the same uuid to domains list. This fix splits logic of prlsdkAddDomain() into two new functions. 1. prlsdkNewDomain() creates new empty domain in domains list with the specific uuid. 2. prlsdkSetDomainInstance() add data from VM to domain object. Patch 3 fixes notification subscription. To get domain info we should receive and handle notification from hypervisor. Mikhail Feoktistov (4): vz: Split logic of prlsdkAddDomain() into two functions vz: Remove prlsdkAddDomain() and use new functions vz: remove code duplication from LoadDomain() vz: fix notification subscription src/vz/vz_driver.c | 14 ++++- src/vz/vz_sdk.c | 156 ++++++++++++++++++++++++++++++----------------------- src/vz/vz_sdk.h | 8 ++- 3 files changed, 107 insertions(+), 71 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH v2 1/2] conf: expose virDomainBootType(From|To)String
by Roman Bogorodskiy 25 Jan '16

25 Jan '16

These functions are going to be used by the Bhyve driver. --- src/libvirt_private.syms | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1e51dcf..50f0b3f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -152,6 +152,8 @@ virDiskNameToIndex; virDomainActualNetDefFree; virDomainBlockedReasonTypeFromString; virDomainBlockedReasonTypeToString; +virDomainBootTypeFromString; +virDomainBootTypeToString; virDomainCapabilitiesPolicyTypeToString; virDomainCapsFeatureTypeToString; virDomainChrConsoleTargetTypeFromString; -- 2.4.6

2 5

[libvirt] [PATCH v2] vmx: Adapt to emptyBackingString for cdrom-image
by Michal Privoznik 24 Jan '16

24 Jan '16

https://bugzilla.redhat.com/show_bug.cgi?id=1266088 We are missing this value for cdrom-image device. Honestly, I have no idea whether it can happen for other disk devices too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -extened support for scsi CDROM too -added formatting code -added couple of tests src/vmx/vmx.c | 38 +++++++++++++++++++++----- tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx | 5 ++++ tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml | 23 ++++++++++++++++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx | 6 ++++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml | 23 ++++++++++++++++ tests/vmx2xmltest.c | 3 ++ tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx | 13 +++++++++ tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml | 13 +++++++++ tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx | 14 ++++++++++ tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml | 13 +++++++++ tests/xml2vmxtest.c | 2 ++ 11 files changed, 146 insertions(+), 7 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d1cdad3..10fec74 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2246,6 +2246,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con * call to this function to parse a CDROM device may handle it. */ goto ignore; + } else if (STREQ(fileName, "emptyBackingString")) { + if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'cdrom-image' " + "but found '%s'"), deviceType_name, deviceType); + goto cleanup; + } + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); + ignore_value(virDomainDiskSetSource(*def, NULL)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -2319,6 +2329,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con */ goto ignore; } + } else if (STREQ(fileName, "emptyBackingString")) { + if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'cdrom-image' " + "but found '%s'"), deviceType_name, deviceType); + goto cleanup; + } + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); + ignore_value(virDomainDiskSetSource(*def, NULL)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -3526,15 +3546,19 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, if (type == VIR_STORAGE_TYPE_FILE) { const char *src = virDomainDiskGetSource(def); - if (src && ! virFileHasSuffix(src, fileExt)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for %s %s '%s' has " - "unsupported suffix, expecting '%s'"), - busType, deviceType, def->dst, fileExt); + if (src) { + if (!virFileHasSuffix(src, fileExt)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Image file for %s %s '%s' has " + "unsupported suffix, expecting '%s'"), + busType, deviceType, def->dst, fileExt); return -1; - } + } - fileName = ctx->formatFileName(src, ctx->opaque); + fileName = ctx->formatFileName(src, ctx->opaque); + } else { + ignore_value(VIR_STRDUP(fileName, "emptyBackingString")); + } if (fileName == NULL) return -1; diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx new file mode 100644 index 0000000..62fdb3d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx @@ -0,0 +1,5 @@ +config.version = "8" +virtualHW.version = "4" +ide0:0.present = "true" +ide0:0.deviceType = "cdrom-image" +ide0:0.fileName = "emptyBackingString" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml new file mode 100644 index 0000000..232200b --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml @@ -0,0 +1,23 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx new file mode 100644 index 0000000..3c6036a --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx @@ -0,0 +1,6 @@ +config.version = "8" +virtualHW.version = "4" +scsi0.present = "true" +scsi0:0.present = "true" +scsi0:0.deviceType = "cdrom-image" +scsi0:0.fileName = "emptyBackingString" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml new file mode 100644 index 0000000..f2e4c75 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml @@ -0,0 +1,23 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 0bbf055..a22af75 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -219,14 +219,17 @@ mymain(void) DO_TEST("harddisk-transient", "harddisk-transient"); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file"); + DO_TEST("cdrom-scsi-empty", "cdrom-scsi-empty"); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device"); DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device"); DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect"); DO_TEST("cdrom-scsi-passthru", "cdrom-scsi-passthru"); DO_TEST("cdrom-ide-file", "cdrom-ide-file"); + DO_TEST("cdrom-ide-empty", "cdrom-ide-empty"); DO_TEST("cdrom-ide-device", "cdrom-ide-device"); DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device"); DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); + DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); DO_TEST("floppy-file", "floppy-file"); DO_TEST("floppy-device", "floppy-device"); diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx new file mode 100644 index 0000000..45c7950 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx @@ -0,0 +1,13 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "cdrom-ide-file" +memsize = "4" +numvcpus = "1" +ide0:0.present = "true" +ide0:0.deviceType = "cdrom-image" +ide0:0.fileName = "emptyBackingString" +floppy0.present = "false" +floppy1.present = "false" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml new file mode 100644 index 0000000..219603e --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml @@ -0,0 +1,13 @@ +<domain type='vmware'> + <name>cdrom-ide-file</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory unit='KiB'>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='cdrom'> + <target dev='hda' bus='ide'/> + </disk> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx new file mode 100644 index 0000000..1097cb1 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx @@ -0,0 +1,14 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "cdrom-scsi-empty" +memsize = "4" +numvcpus = "1" +scsi0.present = "true" +scsi0:0.present = "true" +scsi0:0.deviceType = "cdrom-image" +scsi0:0.fileName = "emptyBackingString" +floppy0.present = "false" +floppy1.present = "false" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml new file mode 100644 index 0000000..a5a6d80 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml @@ -0,0 +1,13 @@ +<domain type='vmware'> + <name>cdrom-scsi-empty</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory unit='KiB'>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='cdrom'> + <target dev='sda' bus='scsi'/> + </disk> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 32bad5f..d970240 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -235,11 +235,13 @@ mymain(void) DO_TEST("harddisk-ide-file", "harddisk-ide-file", 4); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", 4); + DO_TEST("cdrom-scsi-empty", "cdrom-scsi-empty", 4); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", 4); DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device", 4); DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect", 4); DO_TEST("cdrom-scsi-passthru", "cdrom-scsi-passthru", 4); DO_TEST("cdrom-ide-file", "cdrom-ide-file", 4); + DO_TEST("cdrom-ide-empty", "cdrom-ide-empty", 4); DO_TEST("cdrom-ide-device", "cdrom-ide-device", 4); DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device", 4); DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect", 4); -- 2.4.10

2 1

[libvirt] [PATCH v4] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 23 Jan '16

23 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch sets the socket buffer size to 128K and turns on message peeking on new function virNetlinkAlloc,as this would solve this problem totally and permanetly. Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> CC: Laine Stump <laine(a)laine.org> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 42 ++++++++++++++++++++++++++++++++++++++---- src/util/virnetlink.h | 7 +++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..02f5215 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -64,13 +64,11 @@ struct virNetlinkEventHandle { }; # ifdef HAVE_LIBNL1 -# define virNetlinkAlloc nl_handle_alloc +# define virSocketSetBufferSize nl_set_buffer_size # define virNetlinkFree nl_handle_destroy -typedef struct nl_handle virNetlinkHandle; # else -# define virNetlinkAlloc nl_socket_alloc +# define virSocketSetBufferSize nl_socket_set_buffer_size # define virNetlinkFree nl_socket_free -typedef struct nl_sock virNetlinkHandle; # endif typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate; @@ -108,6 +106,42 @@ static virNetlinkHandle *placeholder_nlhandle; /* Function definitions */ /** + * virNetlinkAlloc + * + * Perform netlink allocation which was defined differently for libnl3 + * vs libnl-1, and did all of three in one function + * 1) create socket + * 2) set larger buffer size + * 3) turn on message peeking + * + * see the following email message: + * https://www.redhat.com/archives/libvir-list/2016-January/msg00536.html + * + * Returns virNetlinkHandle + */ +virNetlinkHandle *virNetlinkAlloc(void) +{ + virNetlinkHandle *netlinknh; + #ifdef HAVE_LIBNL1 + netlinknh = nl_handle_alloc(); + #else + netlinknh = nl_socket_alloc(); + #endif + + if (virSocketSetBufferSize(netlinknh,131702,0) >= 0) { + nl_socket_enable_msg_peek(netlinknh); + return netlinknh; + } + + virReportSystemError(errno, + "%s",_("can not set socket buffer size to 128k")); + + virNetlinkFree(netlinknh); + + return NULL; +} + +/** * virNetlinkStartup: * * Perform any initialization that needs to take place before the diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 0664a7a..b4a2010 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -44,6 +44,13 @@ struct nlmsghdr; # endif /* __linux__ */ +# ifdef HAVE_LIBNL1 +typedef struct nl_handle virNetlinkHandle; +# else +typedef struct nl_sock virNetlinkHandle; +# endif +virNetlinkHandle *virNetlinkAlloc(void); + int virNetlinkStartup(void); void virNetlinkShutdown(void); -- 1.9.1

2 2

Re: [libvirt] Accessing libvirtd remotely as non-root user
by Warren Usui 23 Jan '16

23 Jan '16

I joined this mailing list after I googled and found this thread. https://www.redhat.com/archives/libvir-list/2015-June/msg00583.html Part of this thread read: >So, further digging led me to [2], which in essence was the section of the libvirtd wiki page that the page claimed >was obsolete. Creating the .pkla authorization file finally enabled non-root privileged user management of a remote > >KVM host. I was having this same problem, and I believe that what was needed was just the last usermod that added the non-root user to the libvirt group. I did just that one line and things seemed to be much happier.

1 0

Re: [libvirt] [PATCH 1/2] logical: Use correct syntax for thin/sparse pool creation
by Joe Harvell 22 Jan '16

22 Jan '16

John/Jan: I actually made a patch similar to this and was about to submit it for review. Now I see there is a more thorough version here already submitted just over a year ago. I don't see any evidence of this in the git repo. Are there any plans to commit it? --- Joe Harvell

2 4

[libvirt] [PATCH 0/7] PCI hostdev refactoring
by Andrea Bolognani 22 Jan '16

22 Jan '16

This series is part of my ongoing quest to fix Bug 1272300[1]. I had previously posted a mostly complete solution[2], which did however fail to handle devices detached / reattached using virsh's nodedev-* commands. Part of that series has already been merged. This series refactors the PCI hostdev code so that all detach / reattach operations go through a single function, which means that once the previous code is reimplemented on top of it, all cases will be handled correctly. One problem with the previous code is that bookkeeping was performed all over the place, making it very easy to introduce subtle bugs. After this refactoring it's hopefully easier to follow along. Despite this being a refactoring, it introduces some changes in behaviour. These changes do, in fact, improve consistency, and should not cause any issue AFAICT, but they're still worth mentioning and thinking over. Basically, every time a device is detached from the host, its original status will be restored once it's reattached, which means that if it was not bound to any driver when 'virsh nodedev-detach' is called, it will not be bound to any driver after 'virsh nodedev-reattach' is called. This is the same thing that used to happen, and still happens, when such a managed PCI hostdev is attached and then detached from a guest. One more thing worth mentioning is that the code now relies heavily on libvirt's internal state, ie. the list of active and inactive PCI hostdevs. These lists do not currently survive daemon restarts, so the series is unfit for merge until that detail is sorted out. It's unclear to me how I could go about that, any suggestion? Cheers. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1272300 [2] https://www.redhat.com/archives/libvir-list/2015-December/msg00070.html Andrea Bolognani (7): hostdev: Add reattachPCIDevices() hostdev: Use common reattach code to rollback prepare errors hostdev: Use common reattach code in virHostdevPCINodeDeviceReAttach() hostdev: Add detachPCIDevices() hostdev: Use common detach code in virHostdevPCINodeDeviceDetach() pci: Phase out virPCIDeviceReattachInit() pci: Add debug messages when unbinding from stub driver src/libvirt_private.syms | 1 - src/util/virhostdev.c | 389 +++++++++++++++++++++++++++++------------------ src/util/virpci.c | 30 ++-- src/util/virpci.h | 1 - tests/virpcitest.c | 5 +- 5 files changed, 267 insertions(+), 159 deletions(-) -- 2.5.0

2 15

[libvirt] [PATCH 0/2] macvtap/802.1Qbh fixes
by Laine Stump 22 Jan '16

22 Jan '16

The first patch generally improves performance when creating a lot of macvtap devices. It was inspired by Tony Krowiak's email back in November. The 2nd patch eliminates a bogus error when destroying a macvtap passthrough device that is using 802.1Qbh. Laine Stump (2): util: keep/use a bitmap of in-use macvtap devices util: reset MAC address of macvtap passthrough physdev after disassociate src/libvirt_private.syms | 2 + src/qemu/qemu_process.c | 10 +- src/util/virnetdevmacvlan.c | 454 +++++++++++++++++++++++++++++++++++++------- src/util/virnetdevmacvlan.h | 5 +- 4 files changed, 398 insertions(+), 73 deletions(-) -- 2.5.0

2 5

[libvirt] [PATCH v2 00/15] Implement post-copy migration
by Jiri Denemark 22 Jan '16

22 Jan '16

(See "Add public APIs for post-copy migration" patch for more details about post-copy migration.) Post-copy support was originally written by Cristian Klein in 2014, but no one touched the series since then. Some patches in this series are modified versions of the old patches from Cristian, some patches had to be rewritten from scratch since libvirt code changed a lot (we started using migration events), and some patches are completely new. While post-copy migration is included in QEMU 2.5.0, it didn't support everything libvirt needs. Thus you need QEMU from git to use post-copy. Luckily, the QEMU migration capability we need to enable to use post-copy is still prefixed with "x-", which means it's still considered experimental. Once we are sure QEMU gives us all we need, the "x-" prefix will be removed. Seamless SPICE migration doesn't work with post-copy now, but I'll look at that. Fetching statistics of a completed post-copy migration does not work either (libvirt would report incorrect data). This series (VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY support) depends on "Introduce migration iteration event" series I sent yesterday. Version 2: - VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY flag dropped - --postcopy-after-precopy implemented entirely in virsh Cristian Klein (6): Add public APIs for post-copy migration qemu: Add QMP functions for post-copy migration qemu: Add support for VIR_MIGRATE_POSTCOPY flag qemu: Implement virDomainMigrateStartPostCopy virsh: Add support for post-copy migration virsh: Add --postcopy-after-precopy option to migrate Jiri Denemark (9): Add event and state details for post-copy qemu: Don't explicitly stop CPUs after migration qemu: Handle postcopy-active migration state virsh: Configurable migrate --timeout action qemu: Don't kill running migrated domain on daemon restart qemu: Refactor qemuProcessRecoverMigration qemu: Handle post-copy migration failures qemu: Refuse to abort migration in post-copy mode qemu: Add flags to qemuMigrationWaitForCompletion examples/object-events/event-test.c | 9 ++ include/libvirt/libvirt-domain.h | 11 ++ src/conf/domain_conf.c | 7 +- src/driver-hypervisor.h | 5 + src/libvirt-domain.c | 114 +++++++++++++++ src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 72 ++++++++- src/qemu/qemu_migration.c | 283 ++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 6 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 +++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 249 +++++++++++++++++++------------ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + tools/virsh-domain-monitor.c | 7 +- tools/virsh-domain.c | 158 ++++++++++++++++++-- tools/virsh.pod | 31 +++- 22 files changed, 865 insertions(+), 160 deletions(-) -- 2.7.0

2 27

[libvirt] rbd: Add support for wiping and cloning images to storage driver
by Wido den Hollander 22 Jan '16

22 Jan '16

These two patches add support for buildVolFrom and wipeVol to the RBD storage driver. Wiping is done by discarding all blocks on the RBD image. Building a volume from a original is done leveraging the cloning mechanism RBD already supports.

3 14

[libvirt] [PATCH 0/4] lxc: fix 'free' usage on fedora 23
by Cole Robinson 22 Jan '16

22 Jan '16

We need to add a few bits to our /proc/meminfo virtualization to make 'free' work correctly on Fedora 23. https://bugzilla.redhat.com/show_bug.cgi?id=1300781 Cole Robinson (4): lxc: fuse: Unindent meminfo logic lxc: fuse: Fix /proc/meminfo size calculation lxc: fuse: Fill in MemAvailable for /proc/meminfo lxc: fuse: Stub out Slab bits in /proc/meminfo src/lxc/lxc_fuse.c | 141 +++++++++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 65 deletions(-) -- 2.5.0

2 6

[libvirt] parsing url with percent sign when user want to use iso disk via http
by Vasiliy Tolstov 22 Jan '16

22 Jan '16

I found a strange thing, when i specify url for iso in libvirt xml like: qemu gets invalid url in cmdline i think that problem is qemu/qemu_command.c:3430: ret = virURIFormat(uri); test string looks like https://alukardd.org/data/test?t=1 qemu gets url with percent urlencoded %3F , in this case http server get not test with param t=1 but filename test%3Ft=1 so this is not right. why libvirt try to fix contructed url ? does it safe to delete this line ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 2

[libvirt] An AB deadlock and libvirtd crash problem the other day with virsh console
by weifuqiang 22 Jan '16

22 Jan '16

Hi all: I encountered with an AB deadlock and libvirtd crash problem the other day. The process to generate the problems: 1 use the command "virsh create ***.xml" to create a vm 2 after vm is running , use the command "virsh console ***" to connect vm with console 3 after connection, use the command "virsh destroy ****" to destroy vm and delete it Then, an AB lock problem occurs, or libvirtd got crashed. AB LOCK stack: [Switching to thread 1 (Thread 0x7ff96bf3d7a0 (LWP 9772))] #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007ff967b44669 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007ff967b4447e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007ff96b3bd96c in virChrdevFDStreamCloseCb () from /usr/lib64/libvirt.so.0 #4 0x00007ff96b3c9a34 in virFDStreamCloseInt () from /usr/lib64/libvirt.so.0 #5 0x00007ff96b40ac3e in virStreamAbort () from /usr/lib64/libvirt.so.0 #6 0x00007ff96bfa242a in daemonStreamHandleAbort () #7 0x00007ff96bfa2803 in daemonStreamEvent () #8 0x00007ff96b3c9bfc in virFDStreamEvent () from /usr/lib64/libvirt.so.0 #9 0x00007ff96b3083aa in virEventPollRunOnce () from /usr/lib64/libvirt.so.0 #10 0x00007ff96b307042 in virEventRunDefaultImpl () from /usr/lib64/libvirt.so.0 #11 0x00007ff96b4503dd in virNetDaemonRun () from /usr/lib64/libvirt.so.0 #12 0x00007ff96bf72528 in main () [Switching to thread 12 (Thread 0x7ff9640ff700 (LWP 9778))] #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007ff967b44669 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007ff967b4447e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007ff96b3c8f26 in virFDStreamSetInternalCloseCb () from /usr/lib64/libvirt.so.0 #4 0x00007ff96b30f7b9 in virHashForEach () from /usr/lib64/libvirt.so.0 #5 0x00007ff96b3be1a2 in virChrdevFree () from /usr/lib64/libvirt.so.0 #6 0x00007ff96055980f in qemuDomainObjPrivateFree () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #7 0x00007ff96b367014 in virDomainObjDispose () from /usr/lib64/libvirt.so.0 #8 0x00007ff96b330c33 in virObjectUnref () from /usr/lib64/libvirt.so.0 #9 0x00007ff96b35edb9 in virDomainObjEndAPI () from /usr/lib64/libvirt.so.0 #10 0x00007ff9605c6e89 in qemuDomainUndefineFlags () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #11 0x00007ff96b3e35ac in virDomainUndefine () from /usr/lib64/libvirt.so.0 #12 0x00007ff96bf996db in remoteDispatchDomainUndefineHelper () #13 0x00007ff96b4537ef in virNetServerProgramDispatch () from /usr/lib64/libvirt.so.0 #14 0x00007ff96b45205e in virNetServerProcessMsg () from /usr/lib64/libvirt.so.0 #15 0x00007ff96b4520e8 in virNetServerHandleJob () from /usr/lib64/libvirt.so.0 #16 0x00007ff96b349f94 in virThreadPoolWorker () from /usr/lib64/libvirt.so.0 #17 0x00007ff96b3494a8 in virThreadHelper () from /usr/lib64/libvirt.so.0 #18 0x00007ff967b42806 in start_thread () from /lib64/libpthread.so.0 #19 0x00007ff96789d67d in clone () from /lib64/libc.so.6 #20 0x0000000000000000 in ?? () coredump stack (gdb) f 1 #1 0x00007f1672a7c73f in virMutexLock (m=0x68) at util/virthread.c:89 89 pthread_mutex_lock(&m->lock); (gdb) bt #0 0x00007f1670ace444 in pthread_mutex_lock () from /lib64/libpthread.so.0 #1 0x00007f1672a7c73f in virMutexLock (m=0x68) at util/virthread.c:89 #2 0x00007f1672b2fda2 in virFDStreamSetInternalCloseCb (st=0x7f1673a1a370, cb=0x0, opaque=0x0, fcb=0x0) at fdstream.c:796 #3 0x00007f1672b1f5ad in virChrdevFreeClearCallbacks (payload=0x7f1673a1a370, name=0x7f1673a12520, data=0x0) at conf/virchrdev.c:301 #4 0x00007f1672a36c9b in virHashForEach (table=0x7f1673a0ba20, iter=0x7f1672b1f567 <virChrdevFreeClearCallbacks>, data=0x0) at util/virhash.c:521 #5 0x00007f1672b1f626 in virChrdevFree (devs=0x7f1673a2f820) at conf/virchrdev.c:316 #6 0x00007f1669cca988 in qemuDomainObjPrivateFree (data=0x7f1673a1afa0) at qemu/qemu_domain.c:496 #7 0x00007f1672a9e293 in virDomainObjDispose (obj=0x7f1673a16400) at conf/domain_conf.c:2545 #8 0x00007f1672a5b326 in virObjectUnref (anyobj=0x7f1673a16400) at util/virobject.c:265 #9 0x00007f1672a9e7a5 in virDomainObjEndAPI (vm=0x7f166b07d8d0) at conf/domain_conf.c:2684 #10 0x00007f1669d3ff00 in qemuDomainDestroyFlags (dom=0x7f16600017f0, flags=0) at qemu/qemu_driver.c:2264 #11 0x00007f1669d3ff69 in qemuDomainDestroy (dom=0x7f16600017f0) at qemu/qemu_driver.c:2273 #12 0x00007f1672b39333 in virDomainDestroy (domain=0x7f16600017f0) at libvirt-domain.c:483 #13 0x00007f16737167a5 in remoteDispatchDomainDestroy (server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70, rerr=0x7f166b07db50, args=0x7f1673a2f9b0) at remote_dispatch.h:4002 #14 0x00007f1673716648 in remoteDispatchDomainDestroyHelper (server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70, rerr=0x7f166b07db50, args=0x7f1673a2f9b0, ret= 0x7f1673a10e10) at remote_dispatch.h:3977 #15 0x00007f1672bd8a9b in virNetServerProgramDispatchCall (prog=0x7f167399c610, server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70) at rpc/virnetserverprogram.c:437 #16 0x00007f1672bd85fd in virNetServerProgramDispatch (prog=0x7f167399c610, server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70) at rpc/virnetserverprogram.c:307 #17 0x00007f1672bd2a08 in virNetServerProcessMsg (srv=0x7f167398f4f0, client=0x7f1673a172f0, prog=0x7f167399c610, msg=0x7f1673a2fc70) at rpc/virnetserver.c:136 #18 0x00007f1672bd2aed in virNetServerHandleJob (jobOpaque=0x7f1673a1d780, opaque=0x7f167398f4f0) at rpc/virnetserver.c:157 #19 0x00007f1672a7d833 in virThreadPoolWorker (opaque=0x7f167399bad0) at util/virthreadpool.c:145 #20 0x00007f1672a7cbec in virThreadHelper (data=0x7f167399c980) at util/virthread.c:206 #21 0x00007f1670acc806 in start_thread () from /lib64/libpthread.so.0 #22 0x00007f167082767d in clone () from /lib64/libc.so.6 #23 0x0000000000000000 in ?? () (gdb) bt #0 0x00007f1670ad3324 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007f1670ace669 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007f1670ace47e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007f1672a7c73f in virMutexLock (m=0x7f1673a2f820) at util/virthread.c:89 #4 0x00007f1672b1f3fe in virChrdevFDStreamCloseCb (st=0x7f1673a1a370, opaque=0x7f1673a149e0) at conf/virchrdev.c:254 #5 0x00007f1672b2e8a8 in virFDStreamCloseInt (st=0x7f1673a1a370, streamAbort=true) at fdstream.c:329 #6 0x00007f1672b2e9d5 in virFDStreamAbort (st=0x7f1673a1a370) at fdstream.c:355 #7 0x00007f1672b7d856 in virStreamAbort (stream=0x7f1673a1a370) at libvirt-stream.c:663 #8 0x00007f16737497e8 in daemonStreamHandleAbort (client=0x7f1673a1b1b0, stream=0x7f1673a1ec50, msg=0x7f1673a0d660) at stream.c:613 #9 0x00007f16737499fa in daemonStreamHandleWrite (client=0x7f1673a1b1b0, stream=0x7f1673a1ec50) at stream.c:662 #10 0x00007f167374866b in daemonStreamEvent (st=0x7f1673a1a370, events=14, opaque=0x7f1673a1b1b0) at stream.c:138 #11 0x00007f1672b2e17a in virFDStreamEvent (watch=18, fd=17, events=14, opaque=0x7f1673a1a370) at fdstream.c:173 #12 0x00007f1672a2c2cb in virEventPollDispatchHandles (nfds=12, fds=0x7f1673a2fda0) at util/vireventpoll.c:509 #13 0x00007f1672a2cb08 in virEventPollRunOnce () at util/vireventpoll.c:658 #14 0x00007f1672a2a9e0 in virEventRunDefaultImpl () at util/virevent.c:308 #15 0x00007f1672bd25d2 in virNetDaemonRun (dmn=0x7f1673990ed0) at rpc/virnetdaemon.c:707 #16 0x00007f167370cad4 in main (argc=3, argv=0x7ffd63276288) at libvirtd.c:1581 The reason of this problem is that fdstream abort event or close event occured at the same time, libvirtd doesn't deal with the synchronousness well enough. //ÄãÕâÀïÔÏÈÏë±í´ïµÄ¾ßÌåÒâË¼ÊÇ£¿ the flows about fdStream is bellow 1¡¢qemuDomainDefineXMLFlags -> virDomainObjListAdd -> qemuDomainObjPrivateAlloc -> virChrdevAlloc -> virHashCreate 2¡¢qemuDomainOpenConsole -> virChrdevOpen -> virHashAddEntry(devs->hash, path, st) 3¡¢virDomainObjDispose -> privateDataFreeFunc (qemuDomainObjPrivateFree) - > virChrdevFree(*dev locked*) -> virChrdevFreeClearCallbacks - > virFDStreamSetInternalCloseCb(*fdst locked*) 4¡¢virFDStreamCloseInt (*fdst locked*) -> icbFreeOpaque(virChrdevFDStreamCloseCb (*dev locked*)) -> virHashRemoveEntry The AB lock problem is obviouse: in step 3, it locks chardev before fdst, and in step 4, it's the opsite way. The reason of libvirtd crash is that: in virFDStreamCloseInt function we set fdst to NULL, while in virFDStreamSetInternalCloseCb we use fdst->lock, note that fdst has already been freed. another crash problem occurs because that when virChrdevFree was earlier finished, dev->hash freed and all date of hash is freed, but fdstream event flow use fdStream after hash free. Ahha~~£¬ libvirtd coredump. All of those problem is because clear vm flow and fdStream flow concurs synchronously. then I fix this problem by modify virChrdevFree() void virChrdevFree(virChrdevsPtr devs) { if (!devs || !devs->hash) return; for (;;) { virMutexLock(&devs->lock); if (0 == virHashSize(devs->hash)) { virMutexUnlock(&devs->lock); break; } virMutexUnlock(&devs->lock); usleep(10 * 1000); } virMutexLock(&devs->lock); virHashFree(devs->hash); virMutexUnlock(&devs->lock); virMutexDestroy(&devs->lock); VIR_FREE(devs); } If the chardev is removed by fdStream close or fdStream abort when vm destroy or shutdown, the modification works well. But I'm not sure is that all chardev would be removed when we clear vm, if not, it would always sleep here. Another solution is as follows: virMutexLock(vm); virChrdevFree(); virMutexUnlock(vm); virMutexLock(vm); virFDStreamCloseInt(); virMutexUnlock(vm); I lock vm before calling these 2 functions, which makes them run sequently. Do you have other better idea to solve this problem. thanks in advance. Best Regards David

2 1

[libvirt] [PATCH 1/4] rbd: Add wiping RBD volumes by using rbd_discard() or rbd_write()
by Wido den Hollander 22 Jan '16

22 Jan '16

This allows user to use the volume wiping functionality of the libvirt storage driver. This patch also adds a new wiping algorithm VIR_STORAGE_VOL_WIPE_ALG_DISCARD By default the VIR_STORAGE_VOL_WIPE_ALG_ZERO algorithm is used and with RBD this will called rbd_write() in chunks of the underlying object size to completely zero out the volume. With VIR_STORAGE_VOL_WIPE_ALG_DISCARD it will call rbd_discard() in the same object size chunks which will trim/discard all underlying RADOS objects in the Ceph cluster. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- include/libvirt/libvirt-storage.h | 4 + src/storage/storage_backend_rbd.c | 157 +++++++++++++++++++++++++++++++++++++- tools/virsh-volume.c | 2 +- 3 files changed, 161 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 2c55c93..139add3 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -153,6 +153,10 @@ typedef enum { VIR_STORAGE_VOL_WIPE_ALG_RANDOM = 8, /* 1-pass random */ + VIR_STORAGE_VOL_WIPE_ALG_DISCARD = 9, /* 1-pass, discard all data on the + volume by using TRIM or + DISCARD */ + # ifdef VIR_ENUM_SENTINELS VIR_STORAGE_VOL_WIPE_ALG_LAST /* diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index e20a54d..c0001d0 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -32,6 +32,7 @@ #include "base64.h" #include "viruuid.h" #include "virstring.h" +#include "virutil.h" #include "rados/librados.h" #include "rbd/librbd.h" @@ -730,6 +731,159 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, return ret; } +static int virStorageBackendRBDVolWipeZero(rbd_image_t image, + char *imgname, + rbd_image_info_t info, + uint64_t stripe_count) +{ + int r = -1; + size_t offset = 0; + uint64_t length; + char *writebuf; + + if (VIR_ALLOC_N(writebuf, info.obj_size * stripe_count) < 0) + goto cleanup; + + while (offset < info.size) { + length = MIN((info.size - offset), (info.obj_size * stripe_count)); + + r = rbd_write(image, offset, length, writebuf); + if (r < 0) { + virReportSystemError(-r, _("writing %llu bytes failed on " + " RBD image %s at offset %llu"), + (unsigned long long)length, + imgname, + (unsigned long long)offset); + goto cleanup; + } + + VIR_DEBUG("Wrote %llu bytes to RBD image %s at offset %llu", + (unsigned long long)length, + imgname, (unsigned long long)offset); + + offset += length; + } + + cleanup: + VIR_FREE(writebuf); + + return r; +} + +static int virStorageBackendRBDVolWipeDiscard(rbd_image_t image, + char *imgname, + rbd_image_info_t info, + uint64_t stripe_count) +{ + int r = -1; + size_t offset = 0; + uint64_t length; + + VIR_DEBUG("Wiping RBD %s volume using discard)", imgname); + + while (offset < info.size) { + length = MIN((info.size - offset), (info.obj_size * stripe_count)); + + r = rbd_discard(image, offset, length); + if (r < 0) { + virReportSystemError(-r, _("discarding %llu bytes failed on " + " RBD image %s at offset %llu"), + (unsigned long long)length, + imgname, + (unsigned long long)offset); + goto cleanup; + } + + VIR_DEBUG("Discarded %llu bytes of RBD image %s at offset %llu", + (unsigned long long)length, + imgname, (unsigned long long)offset); + + offset += length; + } + + cleanup: + return r; +} + +static int virStorageBackendRBDVolWipe(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int algorithm, + unsigned int flags) +{ + virStorageBackendRBDState ptr; + ptr.cluster = NULL; + ptr.ioctx = NULL; + rbd_image_t image = NULL; + rbd_image_info_t info; + uint64_t stripe_count; + int r = -1; + + virCheckFlags(VIR_STORAGE_VOL_WIPE_ALG_ZERO | + VIR_STORAGE_VOL_WIPE_ALG_DISCARD, -1); + + VIR_DEBUG("Wiping RBD image %s/%s", pool->def->source.name, vol->name); + + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) + goto cleanup; + + if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) + goto cleanup; + + r = rbd_open(ptr.ioctx, vol->name, &image, NULL); + if (r < 0) { + virReportSystemError(-r, _("failed to open the RBD image %s"), + vol->name); + goto cleanup; + } + + r = rbd_stat(image, &info, sizeof(info)); + if (r < 0) { + virReportSystemError(-r, _("failed to stat the RBD image %s"), + vol->name); + goto cleanup; + } + + r = rbd_get_stripe_count(image, &stripe_count); + if (r < 0) { + virReportSystemError(-r, _("failed to get stripe count of RBD image %s"), + vol->name); + goto cleanup; + } + + VIR_DEBUG("Need to wipe %llu bytes from RBD image %s/%s", + (unsigned long long)info.size, pool->def->source.name, vol->name); + + switch (algorithm) { + case VIR_STORAGE_VOL_WIPE_ALG_ZERO: + r = virStorageBackendRBDVolWipeZero(image, vol->name, + info, stripe_count); + break; + case VIR_STORAGE_VOL_WIPE_ALG_DISCARD: + r = virStorageBackendRBDVolWipeDiscard(image, vol->name, + info, stripe_count); + break; + default: + virReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), + algorithm); + r = -VIR_ERR_INVALID_ARG; + goto cleanup; + } + + if (r < 0) { + virReportSystemError(-r, _("failed to wipe RBD image %s"), + vol->name); + goto cleanup; + } + + cleanup: + if (image) + rbd_close(image); + + virStorageBackendRBDCloseRADOSConn(&ptr); + return r; +} + virStorageBackend virStorageBackendRBD = { .type = VIR_STORAGE_POOL_RBD, @@ -738,5 +892,6 @@ virStorageBackend virStorageBackendRBD = { .buildVol = virStorageBackendRBDBuildVol, .refreshVol = virStorageBackendRBDRefreshVol, .deleteVol = virStorageBackendRBDDeleteVol, - .resizeVol = virStorageBackendRBDResizeVol, + .wipeVol = virStorageBackendRBDVolWipe, + .resizeVol = virStorageBackendRBDResizeVol }; diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 661c876..f86980f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -906,7 +906,7 @@ static const vshCmdOptDef opts_vol_wipe[] = { VIR_ENUM_DECL(virStorageVolWipeAlgorithm) VIR_ENUM_IMPL(virStorageVolWipeAlgorithm, VIR_STORAGE_VOL_WIPE_ALG_LAST, "zero", "nnsa", "dod", "bsi", "gutmann", "schneier", - "pfitzner7", "pfitzner33", "random"); + "pfitzner7", "pfitzner33", "random", "discard"); static bool cmdVolWipe(vshControl *ctl, const vshCmd *cmd) -- 1.9.1

2 2

[libvirt] [PATCH LIBVIRT v3] libxl: Support cmdline= in xl config files
by Ian Campbell 21 Jan '16

21 Jan '16

... and consolidate the cmdline/extra/root parsing to facilitate doing so. The logic is the same as xl's parse_cmdline from the current xen.git master branch (e6f0e099d2c17de47fd86e817b1998db903cab61). On the formatting side switch to producing cmdline= instead of extra=. Update a few tests and add serveral more. - test-cmdline is added to test the exclusive use of cmdline. - test-fullvirt-direct-kernel-boot.cfg is updated due to the switch on the formatting side and now tests the exclusive use of cmdline=. - Tests are added for both paravirt and fullvirt where the .cfg uses extra= and (paravirt only) root=. These are format (xl->xml) only since the inverse will generate cmdline= hence is not a round trip (which was already true if using root=, which used to generate extra= on the way back). - Tests are added for both paravirt and fullvirt where the .cfg declares cmdline= as well as bogus extra= and (paravirt only) root= entries which should be ignored. Again these are format only tests since the inverse won't include the bogus lines. The last two bullets here required splitting the DO_TEST macro into two halves, as is done in the xmconfigtest.c case. In order to introduce a use of VIR_WARN for logging I had to add virerror.h and VIR_LOG_INIT. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- v2: Use VIR_INFO (adding necessary infra) Don't initialise things to NULL when there is no need. v3: I know know the answer re VIR_FROM_THIS, because Jim fixed it. Initialise cmdline to NULL, since neither I nor gcc were smart enough to spot the uninitialised path I did this in preference to adding the else case, since that apparently won't be masking the compiler's ability to spot uninitialised vars in this function. Add tests Addjust xenFormatXLOS to produce cmdline= instead of extra=. --- src/xenconfig/xen_xl.c | 70 +++++++++++++--------- ...est-fullvirt-direct-kernel-boot-bogus-extra.cfg | 31 ++++++++++ ...est-fullvirt-direct-kernel-boot-bogus-extra.xml | 51 ++++++++++++++++ .../test-fullvirt-direct-kernel-boot-extra.cfg | 30 ++++++++++ .../test-fullvirt-direct-kernel-boot-extra.xml | 51 ++++++++++++++++ .../test-fullvirt-direct-kernel-boot.cfg | 2 +- .../test-paravirt-cmdline-bogus-extra-root.cfg | 13 ++++ .../test-paravirt-cmdline-bogus-extra-root.xml | 32 ++++++++++ .../test-paravirt-cmdline-extra-root.cfg | 15 +++++ .../test-paravirt-cmdline-extra-root.xml | 32 ++++++++++ tests/xlconfigdata/test-paravirt-cmdline.cfg | 14 +++++ tests/xlconfigdata/test-paravirt-cmdline.xml | 32 ++++++++++ tests/xlconfigtest.c | 24 ++++++-- 13 files changed, 365 insertions(+), 32 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml create mode 100644 tests/xlconfigdata/test-paravirt-cmdline.cfg create mode 100644 tests/xlconfigdata/test-paravirt-cmdline.xml diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 026cbcc..be194e3 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -27,6 +27,7 @@ #include "virconf.h" #include "virerror.h" +#include "virlog.h" #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" @@ -35,6 +36,8 @@ #define VIR_FROM_THIS VIR_FROM_XENXL +VIR_LOG_INIT("xen.xen_xl"); + /* * Xen provides a libxl utility library, with several useful functions, * specifically xlu_disk_parse for parsing xl disk config strings. @@ -58,11 +61,46 @@ extern int xlu_disk_parse(XLU_Config *cfg, libxl_device_disk *disk); #endif +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) +{ + char *cmdline = NULL; + const char *root, *extra, *buf; + + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "root", &root, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) + return -1; + + if (buf) { + if (VIR_STRDUP(cmdline, buf) < 0) + return -1; + if (root || extra) + VIR_WARN("ignoring root= and extra= in favour of cmdline="); + } else { + if (root && extra) { + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) + return -1; + } else if (root) { + if (virAsprintf(&cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { + if (VIR_STRDUP(cmdline, extra) < 0) + return -1; + } + } + + *r_cmdline = cmdline; + return 0; +} + static int xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) { size_t i; - const char *extra, *root; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { const char *boot; @@ -84,19 +122,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } #endif if (xenConfigGetString(conf, "boot", &boot, "c") < 0) @@ -132,19 +159,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } } return 0; @@ -503,7 +519,7 @@ xenFormatXLOS(virConfPtr conf, virDomainDefPtr def) return -1; if (def->os.cmdline && - xenConfigSetString(conf, "extra", def->os.cmdline) < 0) + xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0) return -1; #endif @@ -554,7 +570,7 @@ xenFormatXLOS(virConfPtr conf, virDomainDefPtr def) return -1; if (def->os.cmdline && - xenConfigSetString(conf, "extra", def->os.cmdline) < 0) + xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0) return -1; } /* !hvm */ diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg new file mode 100644 index 0000000..83ab975 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg @@ -0,0 +1,31 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +pae = 1 +acpi = 1 +apic = 1 +hap = 0 +viridian = 0 +rtc_timeoffset = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-system-i386" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vncpasswd = "123poi" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] +parallel = "none" +serial = "none" +builder = "hvm" +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +cmdline = "ignore_loglvl" +extra = "SHOULD BE IGNORED" +boot = "d" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml new file mode 100644 index 0000000..f750e02 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml @@ -0,0 +1,51 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>ignore_loglvl</cmdline> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='variable' adjustment='0' basis='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg new file mode 100644 index 0000000..f452af6 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg @@ -0,0 +1,30 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +pae = 1 +acpi = 1 +apic = 1 +hap = 0 +viridian = 0 +rtc_timeoffset = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-system-i386" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vncpasswd = "123poi" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] +parallel = "none" +serial = "none" +builder = "hvm" +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +extra = "ignore_loglvl" +boot = "d" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml new file mode 100644 index 0000000..f750e02 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml @@ -0,0 +1,51 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>ignore_loglvl</cmdline> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='variable' adjustment='0' basis='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg index f452af6..32b08e1 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg @@ -25,6 +25,6 @@ serial = "none" builder = "hvm" kernel = "/tmp/vmlinuz" ramdisk = "/tmp/initrd" -extra = "ignore_loglvl" +cmdline = "ignore_loglvl" boot = "d" disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg new file mode 100644 index 0000000..c5b25af --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg @@ -0,0 +1,13 @@ +localtime = 0 +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge" ] +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +cmdline = "root=/dev/xvda1 console=hvc0" +extra = "SHOULD BE IGNORED" +root = "SHOULD BE IGNORED" +disk = [ "/dev/HostVG/XenGuest2,raw,xvda,w" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml new file mode 100644 index 0000000..f4ab9e6 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml @@ -0,0 +1,32 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>root=/dev/xvda1 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/dev/HostVG/XenGuest2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg new file mode 100644 index 0000000..d0c503b --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg @@ -0,0 +1,15 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge" ] +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +root = "/dev/xvda1" +extra = "console=hvc0" +disk = [ "/dev/HostVG/XenGuest2,raw,xvda,w,backendtype=qdisk" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml new file mode 100644 index 0000000..f4ab9e6 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml @@ -0,0 +1,32 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>root=/dev/xvda1 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/dev/HostVG/XenGuest2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline.cfg b/tests/xlconfigdata/test-paravirt-cmdline.cfg new file mode 100644 index 0000000..c512a05 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline.cfg @@ -0,0 +1,14 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge" ] +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +cmdline = "root=/dev/xvda1 console=hvc0" +disk = [ "/dev/HostVG/XenGuest2,raw,xvda,w,backendtype=qdisk" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline.xml b/tests/xlconfigdata/test-paravirt-cmdline.xml new file mode 100644 index 0000000..f4ab9e6 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline.xml @@ -0,0 +1,32 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>root=/dev/xvda1 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/dev/HostVG/XenGuest2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index e997009..bad69ca 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -180,29 +180,45 @@ mymain(void) if (!(xmlopt = libxlCreateXMLConf())) return EXIT_FAILURE; -#define DO_TEST(name) \ +#define DO_TEST_PARSE(name) \ do { \ struct testInfo info0 = { name, 0 }; \ - struct testInfo info1 = { name, 1 }; \ - if (virtTestRun("Xen XM-2-XML Parse " name, \ + if (virtTestRun("Xen XL-2-XML Parse " name, \ testCompareHelper, &info0) < 0) \ ret = -1; \ - if (virtTestRun("Xen XM-2-XML Format " name, \ + } while (0) + +#define DO_TEST_FORMAT(name) \ + do { \ + struct testInfo info1 = { name, 1 }; \ + if (virtTestRun("Xen XL-2-XML Format " name, \ testCompareHelper, &info1) < 0) \ ret = -1; \ } while (0) +#define DO_TEST(name) \ + do { \ + DO_TEST_PARSE(name); \ + DO_TEST_FORMAT(name); \ + } while (0) + DO_TEST("paravirt-maxvcpus"); DO_TEST("new-disk"); DO_TEST("spice"); DO_TEST("spice-features"); DO_TEST("vif-rate"); + DO_TEST("paravirt-cmdline"); + DO_TEST_FORMAT("paravirt-cmdline-extra-root"); + DO_TEST_FORMAT("paravirt-cmdline-bogus-extra-root"); + #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST DO_TEST("fullvirt-multiusb"); #endif #ifdef LIBXL_HAVE_BUILDINFO_KERNEL DO_TEST("fullvirt-direct-kernel-boot"); + DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra"); + DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra"); #endif virObjectUnref(caps); -- 2.1.4

2 1

[libvirt] [PATCH v2] libxl: dispose libxl_dominfo after libxl_domain_info()
by Joao Martins 21 Jan '16

21 Jan '16

As suggested in a previous thread [0] this patch adds some missing calls to libxl_dominfo_{init,dispose} when doing some of the libxl_domain_info operations which would otherwise lead to memory leaks. [0] https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v1: - Add missing libxl_dominfo_init() on MemoryStats and GetInfo() --- src/libxl/libxl_driver.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 73ed448..560f2a6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxl_dominfo_init(&d_info); + /* Does domain still exist? */ rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Enable domain death events */ libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); + libxl_dominfo_dispose(&d_info); virObjectUnlock(vm); virObjectUnref(cfg); return 0; out: + libxl_dominfo_dispose(&d_info); libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); @@ -1589,6 +1593,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->memory = vm->def->mem.cur_balloon; info->maxMem = virDomainDefGetMemoryActual(vm->def); } else { + libxl_dominfo_init(&d_info); + if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxl_domain_info failed for domain '%d'"), @@ -1598,6 +1604,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->cpuTime = d_info.cpu_time; info->memory = d_info.current_memkb; info->maxMem = d_info.max_memkb; + + libxl_dominfo_dispose(&d_info); } info->state = virDomainObjGetState(vm, NULL); @@ -4791,6 +4799,7 @@ libxlDomainMemoryStats(virDomainPtr dom, virCheckFlags(0, -1); + libxl_dominfo_init(&d_info); cfg = libxlDriverConfigGet(driver); if (!(vm = libxlDomObjFromDomain(dom))) @@ -4822,13 +4831,12 @@ libxlDomainMemoryStats(virDomainPtr dom, ret = i; - libxl_dominfo_dispose(&d_info); - endjob: if (!libxlDomainObjEndJob(driver, vm)) vm = NULL; cleanup: + libxl_dominfo_dispose(&d_info); if (vm) virObjectUnlock(vm); virObjectUnref(cfg); -- 2.1.4

2 1

[libvirt] [PATCH 0/2] Xen: cleanup use of virErrorDomain enum
by Jim Fehlig 21 Jan '16

21 Jan '16

While reviewing a patch from Ian Campbell, I noticed the various Xen-related elements in the virErrorDomain enum were not used correctly throughout the corresponding source files. Patch 1 fixes use of existing Xen-related elements in virErrorDomain. Patch 2 adds a new element for Xen XL config and uses it in src/xenconfig/xen_xl.c. Jim Fehlig (2): Xen: VIR_FROM_THIS cleanup Xen: add XENXL to virErrorDomain enum include/libvirt/virterror.h | 1 + src/util/virerror.c | 1 + src/xen/xs_internal.c | 2 +- src/xenconfig/xen_common.c | 1 + src/xenconfig/xen_sxpr.c | 2 ++ src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 1 + src/xenconfig/xenxs_private.h | 2 -- 8 files changed, 8 insertions(+), 4 deletions(-) -- 2.6.1

2 5

[libvirt] [PATCH LIBVIRT v2] libxl: Support cmdline= in xl config files
by Ian Campbell 21 Jan '16

21 Jan '16

... and consolidate the cmdline/extra/root parsing to facilitate doing so. The logic is the same as xl's parse_cmdline from the current xen.git master branch (e6f0e099d2c17de47fd86e817b1998db903cab61). In order to introduce a use of VIR_WARN for logging I had to add virerror.h and VIR_LOG_INIT. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- NB: I was unsure if I was supposed to change VIR_FROM_NONE into VIR_FROM_XEN, so I didn't (but will on advice). v2: Use VIR_INFO (adding necessary infra) Don't initialise things to NULL when there is no need. --- src/xenconfig/xen_xl.c | 66 +++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 91cdff6..3d820cc 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -27,6 +27,7 @@ #include "virconf.h" #include "virerror.h" +#include "virlog.h" #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" @@ -35,6 +36,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("xen.xen_xl"); + /* * Xen provides a libxl utility library, with several useful functions, * specifically xlu_disk_parse for parsing xl disk config strings. @@ -58,11 +61,46 @@ extern int xlu_disk_parse(XLU_Config *cfg, libxl_device_disk *disk); #endif +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) +{ + char *cmdline; + const char *root, *extra, *buf; + + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "root", &root, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) + return -1; + + if (buf) { + if (VIR_STRDUP(cmdline, buf) < 0) + return -1; + if (root || extra) + VIR_WARN("ignoring root= and extra= in favour of cmdline="); + } else { + if (root && extra) { + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) + return -1; + } else if (root) { + if (virAsprintf(&cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { + if (VIR_STRDUP(cmdline, extra) < 0) + return -1; + } + } + + *r_cmdline = cmdline; + return 0; +} + static int xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) { size_t i; - const char *extra, *root; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { const char *boot; @@ -84,19 +122,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } #endif if (xenConfigGetString(conf, "boot", &boot, "c") < 0) @@ -132,19 +159,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } } return 0; -- 2.1.4

2 3

[libvirt] [python PATCH] Add support for MIGRATION_ITERATION event
by Jiri Denemark 21 Jan '16

21 Jan '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- examples/event-test.py | 4 +++ libvirt-override-virConnect.py | 9 +++++++ libvirt-override.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 2c6ce7b..615f86c 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -530,6 +530,9 @@ def myDomainEventAgentLifecycleCallback(conn, dom, state, reason, opaque): def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque): print("myDomainEventDeviceAddedCallback: Domain %s(%s) device added: %s" % ( dom.name(), dom.ID(), dev)) +def myDomainEventMigrationIteration(conn, dom, iteration, opaque): + print("myDomainEventMigrationIteration: Domain %s(%s) started migration iteration %d" % ( + dom.name(), dom.ID(), iteration)) ########################################################################## # Network events @@ -642,6 +645,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE, myDomainEventTunableCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, myDomainEventAgentLifecycleCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIteration, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 821be87..4231195 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -216,6 +216,15 @@ cb(self, virDomain(self, _obj=dom), devAlias, opaque) return 0 + def _dispatchDomainEventMigrationIterationCallback(self, dom, iteration, cbData): + """Dispatches event to python user domain migration iteration event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), iteration, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index 5f1c98f..a8c019b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6783,6 +6783,58 @@ libvirt_virConnectDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UN } #endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ +#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION +static int +libvirt_virConnectDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int iteration, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventMigrationIterationCallback", + (char*)"OiO", + pyobj_dom, iteration, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} +#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ + static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -6883,6 +6935,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceAddedCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ +#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION + case VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventMigrationIterationCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.7.0

2 1

[libvirt] [PATCH 0/2] Introduce migration iteration event
by Jiri Denemark 21 Jan '16

21 Jan '16

Jiri Denemark (2): Introduce migration iteration event qemu: Add support for migration iteration event daemon/remote.c | 32 ++++++++++++++++++ include/libvirt/libvirt-domain.h | 22 +++++++++++++ src/conf/domain_event.c | 71 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 8 +++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_monitor.c | 13 ++++++++ src/qemu/qemu_monitor.h | 8 +++++ src/qemu/qemu_monitor_json.c | 17 ++++++++++ src/qemu/qemu_process.c | 30 +++++++++++++++++ src/remote/remote_driver.c | 33 +++++++++++++++++++ src/remote/remote_protocol.x | 14 +++++++- src/remote_protocol-structs | 6 ++++ tools/virsh-domain.c | 18 ++++++++++ 13 files changed, 273 insertions(+), 1 deletion(-) -- 2.7.0

2 5

[libvirt] [PATCH v3 0/6] admin: Introduce server listing API
by Erik Skultety 21 Jan '16

21 Jan '16

Since v2: - static names of daemons are passed to virNetServerNew directly, instead of creating an array of names like the previous version did - dropped client-side server identification through ID, only name is used - adjusted naming of some methods (prefixes again...) - converted the server listing example to virt-admin command (finally) Erik Skultety (6): rpc: Introduce new element 'name' to virnetserver structure virnetdaemon: Add post exec restart support for multiple servers admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API virt-admin: Introduce cmdSrvList daemon/Makefile.am | 6 +- daemon/admin.c | 181 +++++++++++++++++++++ daemon/admin.h | 36 ++++ daemon/admin_server.c | 121 +++++--------- daemon/admin_server.h | 23 ++- daemon/libvirtd.c | 4 +- include/libvirt/libvirt-admin.h | 11 ++ po/POTFILES.in | 2 +- src/admin/admin_protocol.x | 26 ++- src/admin_protocol-structs | 15 ++ src/datatypes.c | 36 ++++ src/datatypes.h | 34 ++++ src/libvirt-admin.c | 148 +++++++++++++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 3 + src/locking/lock_daemon.c | 3 +- src/logging/log_daemon.c | 3 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetdaemon.c | 15 ++ src/rpc/virnetdaemon.h | 3 + src/rpc/virnetserver.c | 32 +++- src/rpc/virnetserver.h | 5 + .../input-data-admin-server-names.json | 128 +++++++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 2 + .../output-data-admin-server-names.json | 128 +++++++++++++++ .../virnetdaemondata/output-data-anon-clients.json | 1 + .../output-data-initial-nomdns.json | 1 + tests/virnetdaemondata/output-data-initial.json | 1 + tests/virnetdaemontest.c | 40 ++--- tools/virt-admin.c | 62 +++++++ 30 files changed, 946 insertions(+), 131 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 tests/virnetdaemondata/input-data-admin-server-names.json create mode 100644 tests/virnetdaemondata/output-data-admin-server-names.json -- 2.4.3

2 12

[libvirt] [PATCH] security_selinux: Fix crash in virSecuritySELinuxRestoreFileLabel
by Shanzhi Yu 21 Jan '16

21 Jan '16

when failed to boot a guest, virSecuritySELinuxRestoreFileLabel will be called eventually to reset security label, which will lead a crash if pass null to virFileResolveLink(path, &newpath). https://bugzilla.redhat.com/show_bug.cgi?id=1300532 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 9e98635..c8a7553 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1026,7 +1026,7 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, VIR_INFO("Restoring SELinux context on '%s'", path); - if (virFileResolveLink(path, &newpath) < 0) { + if (path && virFileResolveLink(path, &newpath) < 0) { VIR_WARN("cannot resolve symlink %s: %s", path, virStrerror(errno, ebuf, sizeof(ebuf))); goto err; -- 1.8.3.1

2 1

[libvirt] [PATCH] libxl: dispose libxl_dominfo after libxl_domain_info()
by Joao Martins 21 Jan '16

21 Jan '16

As suggested in a previous thread [0] this patch adds some missing calls to libxl_dominfo_dispose when doing some of the libxl_domain_info operations which would otherwise lead to memory leaks. [0] https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/libxl/libxl_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 73ed448..a449730 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxl_dominfo_init(&d_info); + /* Does domain still exist? */ rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Enable domain death events */ libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); + libxl_dominfo_dispose(&d_info); virObjectUnlock(vm); virObjectUnref(cfg); return 0; out: + libxl_dominfo_dispose(&d_info); libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); @@ -1598,6 +1602,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->cpuTime = d_info.cpu_time; info->memory = d_info.current_memkb; info->maxMem = d_info.max_memkb; + + libxl_dominfo_dispose(&d_info); } info->state = virDomainObjGetState(vm, NULL); -- 2.1.4

2 2

[libvirt] [PATCH] virsh: Don't fetch status for all domains in cmdList
by Michal Privoznik 21 Jan '16

21 Jan '16

We are getting the list of domains and after that we iterate over the list and try to get status for each domain hoping it will skip over domains that disappeared meanwhile. However, this solution to race is bogus - domain may disappear right after we have checked its state and before we exec another API over it (e.g. virDomainHasManagedSaveImage()). Also, when printing just names or uuids (list --name / --uuid) we issue APIs to obtain the values, however these require no RPC call as all requested info is in virDomain object that client already has. Therefore move the status obtaining only to the place that really needs it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain-monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 7eb387d..7dcbc5c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1876,17 +1876,17 @@ cmdList(vshControl *ctl, const vshCmd *cmd) else ignore_value(virStrcpyStatic(id_buf, "-")); - state = virshDomainState(ctl, dom, NULL); - - /* Domain could've been removed in the meantime */ - if (state < 0) - continue; - - if (optTable && managed && state == VIR_DOMAIN_SHUTOFF && - virDomainHasManagedSaveImage(dom, 0) > 0) - state = -2; - if (optTable) { + state = virshDomainState(ctl, dom, NULL); + + /* Domain could've been removed in the meantime */ + if (state < 0) + continue; + + if (managed && state == VIR_DOMAIN_SHUTOFF && + virDomainHasManagedSaveImage(dom, 0) > 0) + state = -2; + if (optTitle) { if (!(title = virshGetDomainDescription(ctl, dom, true, 0))) goto cleanup; -- 2.4.10

2 1

[libvirt] [PATCH] build: predictably generate systemtap tapsets (bz 1173641)
by Cole Robinson 20 Jan '16

20 Jan '16

The generated output is dependent on perl hashtable ordering, which gives different results for i686 and x86_64. Fix this by sorting the hash keys before iterating over them https://bugzilla.redhat.com/show_bug.cgi?id=1173641 --- src/rpc/gensystemtap.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index 2467300..7b80fbf 100755 --- a/src/rpc/gensystemtap.pl +++ b/src/rpc/gensystemtap.pl @@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose) { EOF my $first = 1; -foreach my $type (keys %auth) { +foreach my $type (sort(keys %auth)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (type == ", $type, ") {\n"; @@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose) { EOF $first = 1; -foreach my $type (keys %type) { +foreach my $type (sort(keys %type)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (type == ", $type, ") {\n"; @@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose) { EOF $first = 1; -foreach my $status (keys %status) { +foreach my $status (sort(keys %status)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (status == ", $status, ") {\n"; @@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose) { EOF $first = 1; -foreach my $prog (keys %funcs) { +foreach my $prog (sort(keys %funcs)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (program == ", $funcs{$prog}->{id}, ") {\n"; @@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose) { EOF $first = 1; -foreach my $prog (keys %funcs) { +foreach my $prog (sort(keys %funcs)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n"; -- 2.5.0

2 2

[libvirt] [PATCH] docs: fix syntax-check long line error
by Cole Robinson 20 Jan '16

20 Jan '16

--- Pushed as trivial docs/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 231aa4e..02eca64 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -220,7 +220,8 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ %.png: %.fig convert -rotate 90 $< $@ -%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl sitemap.html.in $(acl_generated) +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ + sitemap.html.in $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ -- 2.5.0

1 0

[libvirt] [PATCH v3] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 20 Jan '16

20 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch sets the socket buffer size to 128K and turns on message peeking for nl_recv,as this would solve this problem totally and permanetly. Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> CC: Laine Stump <laine(a)laine.org> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..ea65cbc 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -65,10 +65,12 @@ struct virNetlinkEventHandle { # ifdef HAVE_LIBNL1 # define virNetlinkAlloc nl_handle_alloc +# define virSocketSetBufferSize nl_set_buffer_size # define virNetlinkFree nl_handle_destroy typedef struct nl_handle virNetlinkHandle; # else # define virNetlinkAlloc nl_socket_alloc +# define virSocketSetBufferSize nl_socket_set_buffer_size # define virNetlinkFree nl_socket_free typedef struct nl_sock virNetlinkHandle; # endif @@ -696,6 +698,14 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) goto error_server; } + if (virSocketSetBufferSize(srv->netlinknh, 131702, 0) < 0) { + virReportSystemError(errno, + "%s",_("cannot set netlink socket buffer size to 128k")); + goto error_server; + } + + nl_socket_enable_msg_peek(srv->netlinknh); + if ((srv->eventwatch = virEventAddHandle(fd, VIR_EVENT_HANDLE_READABLE, virNetlinkEventCallback, -- 1.9.1

3 6

[libvirt] [PATCH] qemuDomainReboot: use fakeReboot=true only for acpi mode
by Dmitry Andreev 20 Jan '16

20 Jan '16

When acpi is used to reboot/shutdown qemu domain, qemu emits SHUTDOWN event. Libvirt uses fakeReboot variable in order to differentiate reboot or shutdown. fakeReboot value is reseted to false after domain restart/reset. When mode=agent is used to reboot qemu domain, qemu doesn't emit SHUTDOWN event and libvirt doesn't reset fakeReboot value to false. In this case next 'shutdown -h now' performs reboot. That's why we don't need to set fakeReboot=true for mode=agent. --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ccf68b..e46404b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2068,8 +2068,6 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) goto endjob; } - qemuDomainSetFakeReboot(driver, vm, isReboot); - if (useAgent) { qemuDomainObjEnterAgent(vm); ret = qemuAgentShutdown(priv->agent, agentFlag); @@ -2096,6 +2094,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) #if WITH_YAJL } #endif + qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); if (qemuDomainObjExitMonitor(driver, vm) < 0) -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: fix generation of docs from VPATH build
by Daniel P. Berrange 20 Jan '16

20 Jan '16

When generating docs in a VPATH build we get a failure to create a file due to the 'internals' subdir not existing: Generating internals/locking.html.tmp /bin/sh: line 3: internals/locking.html.tmp: No such file or directory rm: cannot remove ‘internals/locking.html.tmp’: No such file or directory Makefile:2229: recipe for target 'internals/locking.html.tmp' failed make: *** [internals/locking.html.tmp] Error 1 For some reason, make has decided to run the target %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) instead of the target internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in Removing '$(acl_generated)' from the first target, inexplicably causes make to now run the correct target for the internals/ files. Rather than figure this out, lets just combine the two targets into one. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/Makefile.am | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index fb53a45..231aa4e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -220,21 +220,20 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ %.png: %.fig convert -rotate 90 $< $@ -internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl sitemap.html.in $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ - $(MKDIR_P) internals; \ name=`echo $@ | sed -e 's/.tmp//'`; \ + dir=`dirname $@` ; \ + if test "$$dir" = "."; \ + then \ + style=site.xsl; \ + else \ + $(MKDIR_P) $$dir; \ + style=subsite.xsl; \ + fi; \ $(XSLTPROC) --stringparam pagename $$name --nonet \ - $(top_srcdir)/docs/subsite.xsl $< > $@ \ - || { rm $@ && exit 1; }; fi - -%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) - @if [ -x $(XSLTPROC) ] ; then \ - echo "Generating $@"; \ - name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet \ - $(top_srcdir)/docs/site.xsl $< > $@ \ + $(top_srcdir)/docs/$$style $< > $@ \ || { rm $@ && exit 1; }; fi %.html: %.html.tmp -- 2.5.0

2 1

Re: [libvirt] [PATCH LIBVIRT] libxl: Support cmdline= in xl config files
by Ian Campbell 20 Jan '16

20 Jan '16

I went to ping this but noticed that I had sent it to "jimfehlig" (i.e. no domain), so no wonder there was no reply! To: line fixed here, let me know if you would prefer a resend. Ian. On Wed, 2015-12-16 at 12:09 +0000, Ian Campbell wrote: > ... and consolidate the cmdline/extra/root parsing to facilitate doing > so. > > The logic is the same as xl's parse_cmdline from the current xen.git master > branch (e6f0e099d2c17de47fd86e817b1998db903cab61), except I was unable > to figure out how/where to route the warning about ignoring > root+extra if cmdline was specified. > > Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> > --- > src/xenconfig/xen_xl.c | 62 ++++++++++++++++++++++++++++++------------ > -------- > 1 file changed, 37 insertions(+), 25 deletions(-) > > diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c > index 91cdff6..ba8b938 100644 > --- a/src/xenconfig/xen_xl.c > +++ b/src/xenconfig/xen_xl.c > @@ -58,11 +58,45 @@ extern int xlu_disk_parse(XLU_Config *cfg, > libxl_device_disk *disk); > #endif > > +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) > +{ > + char *cmdline = NULL; > + const char *root = NULL, *extra = NULL, *buf = NULL; > + > + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) > + return -1; > + > + if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + return -1; > + > + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > + return -1; > + > + if (buf) { > + if (VIR_STRDUP(cmdline, buf) < 0) > + return -1; > + /* root or extra are ignored in this case. */ > + } else { > + if (root && extra) { > + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) > + return -1; > + } else if (root) { > + if (virAsprintf(&cmdline, "root=%s", root) < 0) > + return -1; > + } else if (extra) { > + if (VIR_STRDUP(cmdline, extra) < 0) > + return -1; > + } > + } > + > + *r_cmdline = cmdline; > + return 0; > +} > + > static int > xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) > { > size_t i; > - const char *extra, *root; > > if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { > const char *boot; > @@ -84,19 +118,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, > virCapsPtr caps) > if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < > 0) > return -1; > > - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > - return -1; > - > - if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + if (xenParseCmdline(conf, &def->os.cmdline) < 0) > return -1; > - > - if (root) { > - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) > < 0) > - return -1; > - } else { > - if (VIR_STRDUP(def->os.cmdline, extra) < 0) > - return -1; > - } > #endif > > if (xenConfigGetString(conf, "boot", &boot, "c") < 0) > @@ -132,19 +155,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, > virCapsPtr caps) > if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < > 0) > return -1; > > - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > - return -1; > - > - if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + if (xenParseCmdline(conf, &def->os.cmdline) < 0) > return -1; > - > - if (root) { > - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) > < 0) > - return -1; > - } else { > - if (VIR_STRDUP(def->os.cmdline, extra) < 0) > - return -1; > - } > } > > return 0;

2 2

[libvirt] [PATCH 0/2] Fix problem generating partition names for multipath device
by John Ferlan 19 Jan '16

19 Jan '16

Originally posted as an RFC: http://www.redhat.com/archives/libvir-list/2015-December/msg00200.html I've made further adjustments/changes and actually tested in a multipath environment configured with the issue. For these patches, rather than making a "general" flag for the pool, I chose to add an attribute to the <source> 'device'. This way it was much more clear what the attribute was affecting. Additionally, it turned out that the issue was showing up for both 'user_friendly_names' and for custom 'alias' name entries in the /etc/multipath.conf file so rather than being a user_friendly_name type flag - I just chose to specific state what it was - a way to not have the partition separator flag "p" added to the generated name. Also it was a bit more difficult to describe the use of the flag especially when it was so specific to one backing store type. John Ferlan (2): conf: Add storage pool device attribute part_separator storage: Add new flag for libvirt_parthelper docs/formatstorage.html.in | 30 ++++++++++++++++++++-- docs/schemas/storagepool.rng | 5 ++++ src/conf/storage_conf.c | 26 +++++++++++++++++-- src/conf/storage_conf.h | 3 ++- src/storage/parthelper.c | 15 ++++++++--- src/storage/storage_backend_disk.c | 11 +++++++- .../pool-disk-device-nopartsep.xml | 14 ++++++++++ .../pool-disk-device-nopartsep.xml | 14 ++++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-disk-device-nopartsep.xml create mode 100644 tests/storagepoolxml2xmlout/pool-disk-device-nopartsep.xml -- 2.5.0

2 4

[libvirt] [PATCH libguestfs v3] lib: Handle slow USB devices more gracefully.
by Richard W.M. Jones 19 Jan '16

19 Jan '16

Libvirt has a fixed 15 second timeout for qemu to exit. If qemu is writing to a slow USB key, it can hang (in D state) for much longer than this - many minutes usually. The solution is to check specifically for the libvirt EBUSY error when this happens, and retry the virDomainDestroyFlags operation (indefinitely). See also the description here: https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html Similar to the following OpenStack Nova commit: http://git.openstack.org/cgit/openstack/nova/commit/?id=3907867 Thanks: Kashyap Chamarthy and Daniel Berrange. --- src/launch-libvirt.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 8215e02..90b6c49 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <fcntl.h> #include <grp.h> +#include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <assert.h> @@ -2015,6 +2016,8 @@ ignore_errors (void *ignore, virErrorPtr ignore2) /* empty */ } +static int destroy_domain (guestfs_h *g, virDomainPtr dom, int check_for_errors); + static int shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) { @@ -2023,23 +2026,14 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) virDomainPtr dom = data->dom; size_t i; int ret = 0; - int flags; /* Note that we can be called back very early in launch (specifically * from launch_libvirt itself), when conn and dom might be NULL. */ - if (dom != NULL) { - flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; - debug (g, "calling virDomainDestroy \"%s\" flags=%s", - data->name, check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL" : "0"); - if (virDomainDestroyFlags (dom, flags) == -1) { - libvirt_error (g, _("could not destroy libvirt domain")); - ret = -1; - } + ret = destroy_domain (g, dom, check_for_errors); virDomainFree (dom); } - if (conn != NULL) virConnectClose (conn); @@ -2068,6 +2062,37 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) return ret; } +/* Wrapper around virDomainDestroy which handles errors and retries.. */ +static int +destroy_domain (guestfs_h *g, virDomainPtr dom, int check_for_errors) +{ + const int flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; + virErrorPtr err; + + again: + debug (g, "calling virDomainDestroy flags=%s", + check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL" : "0"); + if (virDomainDestroyFlags (dom, flags) == -1) { + err = virGetLastError (); + + /* Second chance if we're just waiting for qemu to shut down. See: + * https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html + */ + if ((flags & VIR_DOMAIN_DESTROY_GRACEFUL) && + err && err->code == VIR_ERR_SYSTEM_ERROR && err->int1 == EBUSY) + goto again; + + /* "Domain not found" is not treated as an error. */ + if (err && err->code == VIR_ERR_NO_DOMAIN) + return 0; + + libvirt_error (g, _("could not destroy libvirt domain")); + return -1; + } + + return 0; +} + /* Wrapper around error() which produces better errors for * libvirt functions. */ -- 2.5.0

2 3

[libvirt] Failed to terminate process 1275 with SIGTERM: Device or resource busy
by Richard W.M. Jones 19 Jan '16

19 Jan '16

I didn't file a bug about this because it's not really clear what the bug is. Anyway, here goes ... $ virt-builder fedora-23 -o /dev/sdX [ 2.3] Downloading: http://libguestfs.org/download/builder/fedora-23.xz [ 3.0] Planning how to build this image [ 3.0] Uncompressing [ 18.1] Resizing (using virt-resize) to expand the disk to 14.9G virt-resize: error: libguestfs error: could not destroy libvirt domain: Failed to terminate process 1275 with SIGTERM: Device or resource busy [code=38 domain=0] $ ps ax | grep qemu 1275 ? Dl 0:49 /usr/bin/qemu-system-x86_64 -machine accel=kvm [...] What's actually happening here is that /dev/sdX is an incredibly slow[1] USB key. The virt-resize operation completes successfully, but qemu is blocked writing/fsyncing to the USB key, and takes a few minutes to exit. libvirt has a loop (src/util/virprocess.c:virProcessKillPainfully) which waits 15 seconds [comment says 10 seconds], and this wait is not configurable. There seem to be several possible solutions, none of them very nice: - Hard-code a longer wait in libvirt. - Make the wait in libvirt configurable. - If the process is in 'D' state, wait indefinitely. I tried another workaround which was to get virt-resize to fsync the output file before closing the libvirt connection, but that doesn't work for reasons I don't understand so far - still studying this. Rich. [1] "Incredibly slow" ... but it's just a regular USB key, they are all very slow! -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

3 8

[libvirt] [PATCH 00/16] Implement post-copy migration
by Jiri Denemark 19 Jan '16

19 Jan '16

(See "Add public APIs for post-copy migration" patch for more details about post-copy migration.) Post-copy support was originally written by Cristian Klein in 2014, but no one touched the series since then. Some patches in this series are modified versions of the old patches from Cristian, some patches had to be rewritten from scratch since libvirt code changed a lot (we started using migration events), and some patches are completely new. While post-copy migration is included in QEMU 2.5.0, it didn't support everything libvirt needs. Thus you need QEMU from git to use post-copy. Luckily, the QEMU migration capability we need to enable to use post-copy is still prefixed with "x-", which means it's still considered experimental. Once we are sure QEMU gives us all we need, the "x-" prefix will be removed. Seamless SPICE migration doesn't work with post-copy now, but I'll look at that. This series (VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY support) depends on "Introduce migration iteration event" series I sent yesterday. Cristian Klein (6): Add public APIs for post-copy migration qemu: Add QMP functions for post-copy migration qemu: Add support for VIR_MIGRATE_POSTCOPY flag qemu: Implement virDomainMigrateStartPostCopy virsh: Add support for post-copy migration virsh: Add --postcopy-after-precopy option to migrate Jiri Denemark (10): Add event and state details for post-copy qemu: Don't explicitly stop CPUs after migration qemu: Handle postcopy-active migration state qemu: Add flags to qemuMigrationWaitForCompletion qemu: Add support for VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY flag virsh: Configurable migrate --timeout action qemu: Don't kill running migrated domain on daemon restart qemu: Refactor qemuProcessRecoverMigration qemu: Handle post-copy migration failures qemu: Refuse to abort migration in post-copy mode examples/object-events/event-test.c | 9 ++ include/libvirt/libvirt-domain.h | 12 ++ src/conf/domain_conf.c | 7 +- src/driver-hypervisor.h | 5 + src/libvirt-domain.c | 140 +++++++++++++++++ src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 72 ++++++++- src/qemu/qemu_migration.c | 299 +++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 7 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 +++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 252 +++++++++++++++++++----------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + tools/virsh-domain-monitor.c | 7 +- tools/virsh-domain.c | 131 ++++++++++++++-- tools/virsh.pod | 31 +++- 22 files changed, 884 insertions(+), 161 deletions(-) -- 2.7.0

2 18

[libvirt] [PATCH] leaseshelper: fix crash when no mac is specified
by Ján Tomko 19 Jan '16

19 Jan '16

If dnsmasq specified DNSMASQ_IAID (so we're dealing with an IPv6 lease) but no DNSMASQ_MAC, we skip creation of the new lease object. Also skip adding it to the leases array. https://bugzilla.redhat.com/show_bug.cgi?id=1202350 https://bugzilla.redhat.com/show_bug.cgi?id=1292941 --- src/network/leaseshelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 2d528f7..6930310 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -439,7 +439,7 @@ main(int argc, char **argv) case VIR_LEASE_ACTION_OLD: case VIR_LEASE_ACTION_ADD: - if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + if (lease_new && virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create json")); goto cleanup; -- 2.4.6

2 1

[libvirt] [PATCH 0/6] Refactor leaseshelper
by Ján Tomko 19 Jan '16

19 Jan '16

Split out some functions to make main() more readable. May depend on https://www.redhat.com/archives/libvir-list/2016-January/msg00595.html No functional change intented. Ján Tomko (6): leaseshelper: store server_duid as an allocated string leaseshelper: split out custom leases file read leaseshelper: split out virLeasePrintLeases leaseshelper: remove useless comparison leaseshelper: split out virLeaseNewFromArgv leaseshelper: reduce indentation level in virLeaseReadCustomLeaseFile src/network/leaseshelper.c | 500 +++++++++++++++++++++++++-------------------- 1 file changed, 284 insertions(+), 216 deletions(-) -- 2.4.6

2 12

[libvirt] [PATCH] cpu_map.xml: Expose svm flag for nested kvm on AMD CPU model
by Lin Ma 19 Jan '16

19 Jan '16

QEMU commit 75d373e disables svm by default since PC machine 2.2. So with PC machine version > 2.1, When a user wants to expose the svm flag to a guest, says: ...... <feature policy='require' name='svm'/> ...... The svm flag wont be passed to qemu command line, This patch fixes it. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..8f96843 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -686,7 +686,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1195,7 +1194,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1257,7 +1255,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1295,7 +1292,6 @@ <feature name='sse'/> <feature name='sse2'/> <feature name='sse4a'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1341,7 +1337,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> <feature name='xop'/> @@ -1391,7 +1386,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tbm'/> <feature name='tsc'/> -- 2.1.4

2 1

[libvirt] [PATCH v2] resize, builder: fsync the output file before closing the libvirt connection.
by Richard W.M. Jones 18 Jan '16

18 Jan '16

Libvirt has a fixed 15 second timeout for qemu to exit. If qemu is writing to a slow USB key, it can hang (in D state) for much longer than this - many minutes usually. To work around this, fsync the output file before closing the libvirt connection so that qemu shouldn't have anything (much) to write. We have to do this in a few places in the code. This is a hack - it would be better to find a way to fix this in libvirt. See also the description here: https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html --- builder/builder.ml | 8 +++++++- resize/resize.ml | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/builder/builder.ml b/builder/builder.ml index 1f9a472..093982d 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -722,7 +722,13 @@ let main () = (* Unmount everything and we're done! *) message (f_"Finishing off"); - g#umount_all (); + if cmdline.sync then ( + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file output_filename + ); + g#shutdown (); g#close (); diff --git a/resize/resize.ml b/resize/resize.ml index d6dd9a5..84e38be 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -1283,6 +1283,11 @@ read the man page virt-resize(1). let g = if to_be_expanded then ( + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file outfile; + g#shutdown (); g#close (); @@ -1354,6 +1359,11 @@ read the man page virt-resize(1). ) lvs ); + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file outfile; + (* Finished. Unmount disks and exit. *) g#shutdown (); g#close (); -- 2.5.0

1 0

[libvirt] [PATCH 0/2] Fix log related crasher
by Michal Privoznik 18 Jan '16

18 Jan '16

*** BLURB HERE *** Michal Privoznik (2): qemuProcessReadLog: Fix memcpy arguments virLogManagerDomainReadLogFile: Don't do dummy allocs src/logging/log_manager.c | 4 +--- src/qemu/qemu_process.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.4.10

3 6

[libvirt] [PATCH v2] qemuTestDriverInit: fill driver with zeroes
by Michal Privoznik 18 Jan '16

18 Jan '16

In the commit aea47e48c473a we have fixed a single pointer within driver structure. Since all callers pass statically allocated driver on stack other pointers within driver may contain random values too. Before touching it lets overwrite it with zeroes and thus fix all dangling pointers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -Jirka's review worked in tests/testutilsqemu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index f2eacdd..ae69a18 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -555,11 +555,11 @@ int qemuTestCapsCacheInsert(virQEMUCapsCachePtr cache, const char *binary, int qemuTestDriverInit(virQEMUDriver *driver) { + memset(driver, 0, sizeof(*driver)); + if (virMutexInit(&driver->lock) < 0) return -1; - driver->securityManager = NULL; - driver->config = virQEMUDriverConfigNew(false); if (!driver->config) goto error; -- 2.4.10

3 2

[libvirt] [python PATCH v2] setup: Use cflags and ldflags properly
by Jiri Denemark 18 Jan '16

18 Jan '16

The setup.py script reads cflags and ldflags from pkg-config and uses them when compiling/linking C modules. Since both cflags and ldflags may include multiple compiler arguments we need to split them rather than concatenating them into a single argument. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: Version 2: - fix all modules I'm surprised it ever worked. setup.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index 9bf583b..c44f84a 100755 --- a/setup.py +++ b/setup.py @@ -88,17 +88,15 @@ def get_module_lists(): c_modules = [] py_modules = [] - ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False) - cflags = get_pkgconfig_data(["--cflags"], "libvirt", False) + ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split() + cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split() module = Extension('libvirtmod', sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt" ], include_dirs = [ "." ]) - if cflags != "": - module.extra_compile_args.append(cflags) - if ldflags != "": - module.extra_link_args.append(ldflags) + module.extra_compile_args.extend(cflags) + module.extra_link_args.extend(ldflags) c_modules.append(module) py_modules.append("libvirt") @@ -107,10 +105,8 @@ def get_module_lists(): sources = ['libvirt-qemu-override.c', 'build/libvirt-qemu.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt-qemu" ], include_dirs = [ "." ]) - if cflags != "": - moduleqemu.extra_compile_args.append(cflags) - if ldflags != "": - moduleqemu.extra_link_args.append(ldflags) + moduleqemu.extra_compile_args.extend(cflags) + moduleqemu.extra_link_args.extend(ldflags) c_modules.append(moduleqemu) py_modules.append("libvirt_qemu") @@ -120,10 +116,8 @@ def get_module_lists(): sources = ['libvirt-lxc-override.c', 'build/libvirt-lxc.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt-lxc" ], include_dirs = [ "." ]) - if cflags != "": - modulelxc.extra_compile_args.append(cflags) - if ldflags != "": - modulelxc.extra_link_args.append(ldflags) + modulelxc.extra_compile_args.extend(cflags) + modulelxc.extra_link_args.extend(ldflags) c_modules.append(modulelxc) py_modules.append("libvirt_lxc") -- 2.7.0

2 1

[libvirt] [python PATCH] setup: Use cflags and ldflags properly
by Jiri Denemark 18 Jan '16

18 Jan '16

The setup.py script reads cflags and ldflags from pkg-config and uses them when compiling/linking C modules. Since both cflags and ldflags may include multiple compiler arguments we need to split them rather than concatenating them into a single argument. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9bf583b..6994e75 100755 --- a/setup.py +++ b/setup.py @@ -96,9 +96,9 @@ def get_module_lists(): libraries = [ "virt" ], include_dirs = [ "." ]) if cflags != "": - module.extra_compile_args.append(cflags) + module.extra_compile_args.extend(cflags.split()) if ldflags != "": - module.extra_link_args.append(ldflags) + module.extra_link_args.extend(ldflags.split()) c_modules.append(module) py_modules.append("libvirt") -- 2.7.0

2 1

[libvirt] [python PATCH] Post-release version bump to 1.3.2
by Jiri Denemark 18 Jan '16

18 Jan '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d2beece..9bf583b 100755 --- a/setup.py +++ b/setup.py @@ -311,7 +311,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.3.1', + version = '1.3.2', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.7.0

1 1

[libvirt] [PATCH 0/2] qemu: Properly detect if qemu is unable to do snapshot due to AHCI
by Peter Krempa 18 Jan '16

18 Jan '16

Peter Krempa (2): qemu: monitor: Refactor error handling for 'savevm' qemu: snapshot: Correctly report qemu error on 'savevm' src/qemu/qemu_monitor_text.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH] rbd: Set r variable so it can be returned should an error occur
by Wido den Hollander 18 Jan '16

18 Jan '16

This was reported in bug #1298024 where r would be filled with the return code of rbd_open(). Should rbd_snap_unprotect() fail for any reason the virReportSystemError call would return 'Success' since rbd_open() succeeded. https://bugzilla.redhat.com/show_bug.cgi?id=1298024 Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/storage/storage_backend_rbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index e20a54d..8c7a80d 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -473,7 +473,8 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, if (snap_count > 0) { for (i = 0; i < snap_count; i++) { - if (rbd_snap_is_protected(image, snaps[i].name, &protected)) { + r = rbd_snap_is_protected(image, snaps[i].name, &protected); + if (r < 0) { virReportSystemError(-r, _("failed to verify if snapshot '%s/%s@%s' is protected"), source->name, vol->name, snaps[i].name); @@ -485,7 +486,8 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, "unprotected", source->name, vol->name, snaps[i].name); - if (rbd_snap_unprotect(image, snaps[i].name) < 0) { + r = rbd_snap_unprotect(image, snaps[i].name); + if (r < 0) { virReportSystemError(-r, _("failed to unprotect snapshot '%s/%s@%s'"), source->name, vol->name, snaps[i].name); -- 1.9.1

2 1

[libvirt] [PATCH 0/3] make containers memory settings API consistent
by Nikolay Shirokovskiy 18 Jan '16

18 Jan '16

Typical HVM hypervisor has 2 memory settings - maximum and current memory. (there could be more memory options of course but let's consider these two and their correlation). Current limit is implemented via ballooning and is not greater than maximum. Containers are different, we need only one parameter to control their memory consumption - current memory. Memory settings API, domain XML schema and domain internal representation arises obviously for HVMs where we have 2 different parameters. How one should adopt it for containers? This patch series makes these 2 parameters synonyms for containers. 1. API - make maximum memory API behaviour same to just memory. 2. internally keep cur_balloon and initial (or total) the same. 3. ignore cur_ballon in XML (we do it already, just keep internal representation consistent) Nikolay Shirokovskiy (3): lxc: make maximum and current settings same conf: keep cur_balloon and initial_memory the same docs: update memory setting descripitons docs/formatdomain.html.in | 6 ++--- src/conf/domain_conf.c | 8 +++++-- src/libvirt-domain.c | 6 ++++- src/lxc/lxc_driver.c | 58 ++++++++++++----------------------------------- tools/virsh.pod | 6 +++++ 5 files changed, 34 insertions(+), 50 deletions(-) -- 1.8.3.1

1 3

[libvirt] [PATCH 0/3] NEWS: Update for 2016
by Andrea Bolognani 18 Jan '16

18 Jan '16

Move all entries made in 2015 to a separate file and perform some minor cleanups while we're at it. Patch 1/3 is kinda big, so it might need to be explicitly allowed out of the moderation queue. Cheers. Andrea Bolognani (3): NEWS: Move 2015 entries to a separate file NEWS: Fix whitespace issues NEWS: Don't prefix version numbers with 'v' docs/{news.html.in => news-2015.html.in} | 325 +--- docs/news.html.in | 2852 +----------------------------- 2 files changed, 6 insertions(+), 3171 deletions(-) copy docs/{news.html.in => news-2015.html.in} (89%) -- 2.5.0

2 5

[libvirt] [PATCH] qemuTestDriverInit: fill driver with zeroes
by Michal Privoznik 18 Jan '16

18 Jan '16

In the commit aea47e48c473a we have fixed a single pointer within driver structure. Since all callers pass statically allocated driver on stack other pointers within driver may contain random values too. Before touching it lets overwrite it with zeroes and thus fix all dangling pointers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/testutilsqemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index f2eacdd..6c52b96 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -558,7 +558,7 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (virMutexInit(&driver->lock) < 0) return -1; - driver->securityManager = NULL; + memset(driver, 0, sizeof(*driver)); driver->config = virQEMUDriverConfigNew(false); if (!driver->config) -- 2.4.10

2 2

[libvirt] [PATCH V2 0/9] support multi-thread compress migration.
by ShaoHe Feng 18 Jan '16

18 Jan '16

These series patches support multi-thread compress during live migration. Eli Qiao (4): Add test cases for qemuMonitorJSONGetMigrationParameter remote: Add support for set and get multil thread migration parameters qemu_driver: Add support to set/get migration parameters. virsh: Add set and get multi-thread migration parameters commands ShaoHe Feng (5): qemu_migration: Add support for mutil-thread compressed migration enable qemu: Add monitor API for get/set migration parameters set multi-thread compress params for Migrate3 during live migration virsh: add multi-thread migration option for live migrate command Implement the public APIs for multi-thread compress parameters. .gnulib | 2 +- daemon/remote.c | 62 +++++++++++ include/libvirt/libvirt-domain.h | 31 ++++++ src/driver-hypervisor.h | 14 +++ src/libvirt-domain.c | 110 +++++++++++++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 186 ++++++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 105 ++++++++++++++++++ src/qemu/qemu_migration.h | 32 ++++-- src/qemu/qemu_monitor.c | 40 ++++++- src/qemu/qemu_monitor.h | 11 ++ src/qemu/qemu_monitor_json.c | 93 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 9 ++ src/qemu/qemu_monitor_text.c | 95 +++++++++++++++++ src/qemu/qemu_monitor_text.h | 10 ++ src/remote/remote_driver.c | 54 ++++++++++ src/remote/remote_protocol.x | 30 +++++- src/remote_protocol-structs | 26 +++++ tests/qemumonitorjsontest.c | 53 ++++++++++ tools/virsh-domain.c | 223 ++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 37 +++++-- 22 files changed, 1212 insertions(+), 19 deletions(-) -- 2.1.4

4 19

[libvirt] [PATCH] Avoid wild securityManager pointer in tests
by Martin Kletzander 17 Jan '16

17 Jan '16

For some reason we are not setting the driver with memset() to zeros. But since commit 74abc3deac6e14ffa9151e425c6e6cd2b075aac5 driver->securityManager is being accessed and qemuagenttest started crashing due to that. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- I chose to just clear the pointer instead of clearing the whole driver with memset() and opening another can of worms. But I would rather do memset() to zeros. however, that can be done after a discussion. This needs to be pushed under the build-breaker rule... Done! tests/testutilsqemu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8a4f567b0b2a..f2eacdded53d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -558,6 +558,8 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (virMutexInit(&driver->lock) < 0) return -1; + driver->securityManager = NULL; + driver->config = virQEMUDriverConfigNew(false); if (!driver->config) goto error; -- 2.7.0

3 4

[libvirt] Release of libvirt-1.3.1
by Daniel Veillard 17 Jan '16

17 Jan '16

As planned I just tagged the release in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also tagged and pushed a python release though there is no change from 1.3.0: ftp://libvirt.org/libvirt/python/ This is a moderately large release with close to 300 commits packed in, one security patch for CVE-2015-5313, and some user visible feature improvement. There is also a lot of refactoring in code, makefiles etc along with other improvements and the usual flow of bug fixes: Features: - Various improvements for the Xen libxl driver (Jim Fehlig) - rbd: Add support for wiping and cloning images to storage driver (Wido den Hollander) - PCI hostdev improvements and fixes (Andrea Bolognani) Security: - CVE-2015-5313: storage: don't allow '/' in filesystem volume names (Eric Blake) Documentation: - virsh: Update description of lxc-enter-namespace (Guido Günther) - virsh: Document the --timestamp option (Andrea Bolognani) - docs: update to properly reflect meaning of fields in log filter (Laine Stump) - virStorageVolWipe: Document that wiping journaled FS is useless (Michal Privoznik) - storage: Add comments for backend APIs (John Ferlan) Portability: - build: fix distdir with wireshark disabled (Cole Robinson) - wireshark: Install into DESTDIR (Michal Privoznik) - cgroup: don't include sys/mount.h if not needed (Jasper Lievisse Adriaanse) - tools: Disable virt-login-shell on mingw (Michal Privoznik) - sysconf: Include unistd.h (Michal Privoznik) - Allow building lxc without virt-login-shell (Cédric Bosdonnat) - build: disable vbox on cygwin (Eric Blake) - virNetDevMacVLanTapSetup: Work around older systems (Michal Privoznik) Bug Fixes: - security: Do not restore labels on device tree binary (Jiri Denemark) - security: Do not restore kernel and initrd labels (Jiri Denemark) - cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup (John Ferlan) - Revert "lxc_cgroup: Add check for NULL cgroup before AddTask call" (John Ferlan) - Revert "util: cgroups do not implicitly add task to new machine cgroup" (John Ferlan) - Revert "qemu: do not put a task into machine cgroup" (John Ferlan) - virt-aa-helper: don't deny writes to readonly mounts (Cédric Bosdonnat) - conf: Initialize 'deflate' for balloon parse XML (John Ferlan) - wireshark: Drop DESTDIR from install path (Michal Privoznik) - qemuProcessCleanupChardevDevice: Don't unlink NULL paths (Michal Privoznik) - xenconfig: check return value of regcomp (Jim Fehlig) - Xen: use correct domctl version in domaininfolist union (Jim Fehlig) - testutils: Fix coverity warning with REGENERATE_OUTPUT (Cole Robinson) - rpc: socket: Don't repeatedly attempt to launch daemon (Cole Robinson) - rpc: socket: Explicitly error if we exceed retry count (Cole Robinson) - rpc: Don't rewrite msg->fds on every read dispatch (Ben Gray) - util: eliminate bogus error log in virNetDevVPortProfileGetStatus (Laine Stump) - qemu: Set virtio channel state sooner (Michal Privoznik) - virDomainGetTime: Deny on RO connections (Michal Privoznik) - virDomainInterfaceAddresses: Allow API on RO connection too (Michal Privoznik) - Don't clear libvirt-internal paths when parsing status XML (Martin Kletzander) - virDomainMigrateUnmanagedParams: Don't blindly dereference @dconnuri (Michal Privoznik) - Fix USB model defaults for ppc64 (Martin Kletzander) - Avoid wild securityManager pointer in tests (Martin Kletzander) - tests: Fix running schematests directly from topdir (Cole Robinson) - qemu: Fix crash when defining XML with bogus emulator (Cole Robinson) - tests.nwfilterebiptablestest: swap actual and expected (Pavel Hrdina) - qemu: Fix NBD migration with default listenAddress (Jiri Denemark) - virLogVMessage: Don't leak rawinitmsg (Michal Privoznik) - virLogHostnameString: Don't leak hostname (Michal Privoznik) - virsh: Interrupt *event --loop on disconnect (Jiri Denemark) - virsh: Pass ctl to virshCatchDisconnect (Jiri Denemark) - qemu: Don't bother user with libvirt-internal paths (Martin Kletzander) - rbd: Do not append Ceph monitor port number 6789 if not provided (Wido den Hollander) - rbd: Do not error out on a single image during pool refresh (Wido den Hollander) - rbd: Only close RBD image if it has been opened (Wido den Hollander) - fix LSB part of virtlogd runlevel script (Olaf Hering) - virtlogd: fix lock file path in initscript (Michael Chapman) - spec: chkconfig(8) and service(8) are in /sbin/, not /bin/ (Michael Chapman) - spec: dbus-devel is needed as build dependency if polkit support is enabled (Michael Chapman) - storage: Clean up error path for create buildPool failure (John Ferlan) - libvirt-domain: fix dxml passing in virDomainMigrateToURI2 (Ján Tomko) - schema: interleave domain name and uuid with other elements (Ján Tomko) - qemu: Fix return value of qemuDomainGetBlockJobInfo (Michal Privoznik) - storage: do not leak storage pool XML filename (Michael Chapman) - qemu: do not leak NBD disk data in migration cookie (Michael Chapman) - qemu: do not copy out non-existent block job info (Michael Chapman) - vz: BUG: fix connecting hang in case of init failure (Maxim Nestratov) - storage: Fix startup issue for logical pool (John Ferlan) - qemu: Fix event generated for qemuDomainRevertToSnapshot (pause->run) (John Ferlan) - storage: Check FS pool source during virStorageBackendFileSystemIsMounted (John Ferlan) - qemuMonitorJSONEjectMedia: Don't leak stringified reply (Michal Privoznik) - virNetDevMacVLanTapSetup: Drop @multiqueue argument (Michal Privoznik) - qemu: Warn when using vhost-user without shared memory (Martin Kletzander) - storage: Ignore block devices that fail format detection (John Ferlan) - storage: Set ret = -1 on failures in virStorageBackendUpdateVolTargetInfo (John Ferlan) - qemu: cgroup: Don't use priv->ncpupids to iterate domain vCPUs (Peter Krempa) - qemu: cpu hotplug: Fix error handling logic (Peter Krempa) - qemu: qemuDomainSetVcpusAgent: re-check agent before calling it the again (Peter Krempa) - libxl: copy persistent domain definition while starting a guest (Pavel Hrdina) - xen: fix timer bug found by updated test (Pavel Hrdina) Improvements: - qemu: Print better warning in qemuAgentNotifyEvent (Yaniv Kaul) - build: Kill tools/wireshark Makefiles (Cole Robinson) - Expand $(wildcard) correctly (Michal Privoznik) - qemu: add support of optional 'autodeflate' attribute (Dmitry Andreev) - qemu: add capability check for memballoon 'deflate-on-oom' feature (Dmitry Andreev) - conf: introduce 'autodeflate' attribute for memballoon device (Dmitry Andreev) - rpc: socket: Minor cleanups (Cole Robinson) - Add missing virxdrdefs.h include to log_protocol (Roman Bogorodskiy) - virsh: Fix alignment in VIRSH_COMMON_OPT_CONFIG definition (Andrea Bolognani) - virsh: Create macro for common "interface" option (John Ferlan) - virsh: Create macro for common "network" option (John Ferlan) - virsh: Create macros for common "vol" options (John Ferlan) - virsh: Create macro for common "file" option (John Ferlan) - virsh: Create macro for common "current" option (John Ferlan) - virsh: Create macro for common "live" option (John Ferlan) - virsh: Create macro for common "config" option (John Ferlan) - virsh: Create macro for common "persistent" option (John Ferlan) - virsh: Create macro for common "domain" option (John Ferlan) - virsh: Adjustments for the VIRSH_COMMON_OPT_POOL (John Ferlan) - virsh: Convert VSH_POOL_ macro to VIRSH_COMMON_OPT_ (John Ferlan) - qemu: use enum when setting PCI "multi" value, not 0 or 1 (Laine Stump) - qemu: auto-add a USB2 controller set for Q35 machines (Laine Stump) - qemu: define virDomainDevAddUSBController() (Laine Stump) - conf: add virDomainDefAddController() (Laine Stump) - qemu: prefer 00:1D.x and 00:1A.x for USB2 controllers on Q35 (Laine Stump) - qemu: don't assume slot 0 is unused/reserved. (Laine Stump) - Unify int types handling in protocol files (Jasper Lievisse Adriaanse) - Use struct sockpeercred when available (Jasper Lievisse Adriaanse) - build: Kill docs/schemas/Makefile.am (Cole Robinson) - build: Kill include/libvirt/Makefile.am (Cole Robinson) - wireshark: Fix header of get_message_len() (Michal Privoznik) - wireshark: Replace WIRESHARK_COMPAT with actual version comparison (Michal Privoznik) - wireshark: s/tvb_length/tvb_captured_length/ (Michal Privoznik) - wireshark: s/ep_alloc/wmem_alloc/ (Michal Privoznik) - wireshark: s/proto_tree_add_text/proto_tree_add_item/ (Michal Privoznik) - qemu: Introduce QEMU_CAPS_VSERPORT_CHANGE (Michal Privoznik) - qemu: change qemuFindAgentConfig return type (Michal Privoznik) - Fix LSB requirements in service script and sync them (Martin Kletzander) - virsh: Add timestamps to network events (Andrea Bolognani) - virsh: Add timestamps to QEMU monitor events (Andrea Bolognani) - Provide parse flags to PostParse functions (Martin Kletzander) - qemu: command: wire up usage of q35/ich9 disable s3/s4 (Cole Robinson) - qemu: caps: check for q35/ICH9 disable S3/S4 (Cole Robinson) - qemu: caps: Rename CAPS_DISABLE_S[34] to CAPS_PIIX_DISABLE_S[34] (Cole Robinson) - qemu: capabilities: s/Pixx/Piix/g (Cole Robinson) - examples: Use one top level makefile (Cole Robinson) - cfg.mk: Drop period after filename for indent failures (Cole Robinson) - virt-host-validate-common: Print warning on missing IOMMU (Michal Privoznik) - tests: qemuxml2xml: Wire up QEMUCaps usage (Cole Robinson) - tests: add genericxml2xmltest (Cole Robinson) - tests: qemuxml2xml: drop early file loading (Cole Robinson) - tests: Share domain XML2XML compare helper (Cole Robinson) - tests: Add newlines with VIR_TEST_REGENERATE_OUTPUT (Cole Robinson) - libxl: support vif outgoing bandwidth QoS (Jim Fehlig) - xenconfig: support vif bandwidth in xm and xl parser and formatter (Jim Fehlig) - xenconfig: support vif bandwidth in sexpr parser and formatter (Jim Fehlig) - util: add missing newline (Laine Stump) - tests: qemuxml2argv: Add tests for USB controller on q35 (Andrea Bolognani) - tests: qemuxml2xml: Convert fprintf to VIR_TEST_DEBUG (Cole Robinson) - qemu: Handle SecurityManagerVerify in post parse (Cole Robinson) - qemu: Handle CanonicalizeMachine in post parse (Cole Robinson) - qemu: domain: split out post parse default device handling (Cole Robinson) - domain: separate out function for post parse timer validation (Cole Robinson) - domain: separate out function for post parse console compat (Cole Robinson) - qemu: Refactor qemuMigrationFinish (Jiri Denemark) - qemu: Report more migration statistics (Jiri Denemark) - qemu: Create a proper type for migration status enum (Jiri Denemark) - qemu: Rename qemuMonitorMigrationStatus struct (Jiri Denemark) - qemu: Reorder migration status enum (Jiri Denemark) - tests.testutils: use virTestDifferenceFull in virtTestCompareToFile (Pavel Hrdina) - tests.testutils: use VIR_TEST_REGENERATE_OUTPUT for virTestDifferenceFull (Pavel Hrdina) - tests: add helper for VIR_TEST_REGENERATE_OUTPUT flag (Pavel Hrdina) - xen: move virDomainDefPostParse to xenParseSxpr (Pavel Hrdina) - Remove non-breaking space in comment (Martin Kletzander) - virsh: Add timestamps to events (Jiri Denemark) - virsh: Refactor event printing (Jiri Denemark) - pci: Log debug messages when manipulating the inactive list (Andrea Bolognani) - qemu: Add debug message to spice migration (Jiri Denemark) - qemu: snapshot: Skip 'transaction' command when no disks are selected (Peter Krempa) - qemu: Specify format= iff disk source is not empty (Michal Privoznik) - conf: Rework code around 'append' attribute (Dmitry Mishin) - Use tristate constants for new 'append' field (Dmitry Mishin) - docs: Describe new 'append' attribute for chardevs source (Dmitry Mishin) - Fix formatting for virDomainGetCPUStats docstring (Martin Kletzander) - maint: update to latest gnulib (Eric Blake) - util: reduce debug log in virPCIGetVirtualFunctions() (Laine Stump) - util: improve error reporting in virNetDevVPortProfileGetStatus (Laine Stump) - util: report the MAC address that couldn't be set (Laine Stump) - rbd: Return VIR_STORAGE_FILE_RAW as format for RBD volumes (Wido den Hollander) - tests: Make test-wrap-argv.pl executable (Michal Privoznik) - tools: Include PIE_LDFLAGS at the correct place (Michal Privoznik) - qemu: Process new 'append' attribute for char dev with output to a file (Dmitry Mishin) - conf: Add new 'append' attribute for chardevs with file source (Dmitry Mishin) - tests: add qemu 2.6 caps test (Dmitry Mishin) - vz: support additional flags in domain undefine (Maxim Nestratov) - vz: move prlsdkCleanupBridgedNet after domain deletion (Maxim Nestratov) - vz: delete domains when undefine is called (Maxim Nestratov) - hostdev: Emit debug messages while handling PCI hostdevs (Andrea Bolognani) - hostdev: Only rollback detach of managed devices on error (Andrea Bolognani) - hostdev: Mark PCI devices as inactive as they're detached (Andrea Bolognani) - pci: Introduce virPCIStubDriver enumeration (Andrea Bolognani) - pci: Remove 'reprobe' parameter from virPCIDeviceUnbind() (Andrea Bolognani) - pci: Remove redundant parameter from virPCIDeviceBindToStub() (Andrea Bolognani) - Revert "admin: Rename virAdmConnect to virAdmDaemon" (Erik Skultety) - Xen: support maxvcpus in xm and xl config (Jim Fehlig) - virsh: Add --delete-snapshots flag for undefine and vol-delete (John Ferlan) - libvirt: Add virStorageVolDeleteFlags to virStorageVolDelete (John Ferlan) - storage: Add virCheckFlags to virStorageBackendRBDDeleteVol (John Ferlan) - lxc_cgroup: Add check for NULL cgroup before AddTask call (John Ferlan) - Xen: remove xendConfigVersion from driver private struct (Jim Fehlig) - Xen: xenconfig: remove xendConfigVersion from public sexpr functions (Jim Fehlig) - Xen: xend: remove use of XEND_CONFIG_VERSION (Jim Fehlig) - Xen: xen_driver: remove use of XEND_CONFIG_VERSION (Jim Fehlig) - Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_sxpr (Jim Fehlig) - Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests (Jim Fehlig) - Xen: xenconfig: remove disks from '(image)' sexpr (Jim Fehlig) - Xen: tests: use latest XEND_CONFIG_VERSION in sexpr2xml tests (Jim Fehlig) - Xen: xenconfig: remove xendConfigVersion from public functions (Jim Fehlig) - Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_xm (Jim Fehlig) - Xen: xenconfig: remove XEND_CONFIG_VERSION in common code (Jim Fehlig) - Xen: tests: use latest XEND_CONFIG_VERSION in xm/xl tests (Jim Fehlig) - Xen: tests: remove old xml2sexpr tests (Jim Fehlig) - Xen: tests: remove old sexpr2xml tests (Jim Fehlig) - Xen: tests: remove net-ioemu xm config test (Jim Fehlig) - Xen: tests: remove old xm config tests (Jim Fehlig) - virsh: Add build flags to pool-create[-as] and pool-start (John Ferlan) - virsh: Create a macro for pool-define-as and pool-create-as options (John Ferlan) - virsh: Create macro for "overwrite" and no-overwrite" options (John Ferlan) - virsh: Create macro for "file" option (John Ferlan) - virsh: Create macro for "pool" option (John Ferlan) - storage: Add flags to allow building pool during create processing (John Ferlan) - mark virDomainVirtioSerialAddrSetAddController as static. (Ján Tomko) - Remove dead code from qemuDomainAttachControllerDevice (Ján Tomko) - qemu_hotplug: remove qemuDomainAttachDeviceControllerLive (Ján Tomko) - storage: Attempt to refresh volume after successful wipe volume (John Ferlan) - virStorageBackendWipeLocal: remove bytes_wiped argument (Ján Tomko) - storage: drop 'Extent' from virStorageBackendWipeExtentLocal (Ján Tomko) - storage: move buffer allocation inside virStorageBackendWipeExtentLocal (Ján Tomko) - storage: fix return values of virStorageBackendWipeExtentLocal (Ján Tomko) - qemu: Replace Mlock with MemLock in function names (Andrea Bolognani) - qemu: Allow qemuDomainAdjustMaxMemLock() to restore previous value (Andrea Bolognani) - qemu: Reduce memlock limit after detaching PCI hostdev (Andrea Bolognani) - qemu: Use qemuDomainAdjustMaxMemLock() (Andrea Bolognani) - qemu: Add qemuDomainAdjustMaxMemLock() (Andrea Bolognani) - process: Add virProcessGetMaxMemLock() (Andrea Bolognani) - process: Allow virProcessPrLimit() to get current limit (Andrea Bolognani) - qemu: Search all nodes for shared memory access (Martin Kletzander) - pci: Use virPCIDeviceAddress in virPCIDevice (Andrea Bolognani) - libxl: Use libxentoollog in preference to libxenctrl if available. (Ian Campbell) - libxl: implement virDomainGetJobStats (Joao Martins) - libxl: implement virDomainGetJobInfo (Joao Martins) - storage: Add helper to compare logical pool def against pvs output (John Ferlan) - storage: Create helper for virStorageBackendLogicalFindPoolSources (John Ferlan) - storage: Refactor virStorageBackendFileSystemGetPoolSource (John Ferlan) - storage: Create helper to generate FS pool source value (John Ferlan) - qemu: add bootindex option to hostdev network interface commandline (Laine Stump) - security_stack: remove extra Security from function names (Ján Tomko) - security_selinux: remove extra Security from function names (Ján Tomko) - security_dac: remove extra Security from function names (Ján Tomko) - qemuMonitorJSONEjectMedia: don't stringify the replay at all (Pavel Hrdina) - pci: Use 'addr' instead of 'dev' for virPCIDeviceAddressPtr (Andrea Bolognani) - qemu cgroups: move new threads to new cgroup after cpuset is set up (Henning Schild) - qemu: do not put a task into machine cgroup (Henning Schild) - util: cgroups do not implicitly add task to new machine cgroup (Henning Schild) - util: Fixup virnetdevmacvlan.h ATTRIBUTE_NONNULL's (John Ferlan) - test: qemuxml2argv: Mock virMemoryMaxValue to remove 32/64 bit difference (Peter Krempa) - qemu: Enable multiqueue for macvtaps (Michal Privoznik) - virNetDevMacVLanCreateWithVPortProfile: Rework to support multiple FDs (Michal Privoznik) - virNetDevMacVLanTapSetup: Allow enabling of IFF_MULTI_QUEUE (Michal Privoznik) - virNetDevMacVLanTapSetup: Rework to support multiple FDs (Michal Privoznik) - virNetDevMacVLanTapOpen: Rework to support multiple FDs (Michal Privoznik) - virNetDevMacVLanTapOpen: Slightly rework (Michal Privoznik) - virNetDevMacVLanCreateWithVPortProfile: Turn vnet_hdr into flag (Michal Privoznik) - log: include hostname in initial log message (Daniel P. Berrange) - storage: Add debug message (John Ferlan) - storage: Handle readflags errors (John Ferlan) - storage: Add readflags for backend error processing (John Ferlan) - tests: scsihost: Use fakerootdir instead of fakesysfsdir (Andrea Bolognani) - tests: Use more specific names for variables (Andrea Bolognani) - tests: Rename LIBVIRT_FAKE_SYSFS_DIR to LIBVIRT_FAKE_ROOT_DIR (Andrea Bolognani) - tests: cgroupmock: Use the temporary directory as fake root (Andrea Bolognani) - tests: pcimock: Use the temporary directory as fake root (Andrea Bolognani) - tests: pcimock: Remove check for fakesysfsdir (Andrea Bolognani) - tests: scsihost: Don't set LIBVIRT_FAKE_SYSFS_DIR (Andrea Bolognani) - qemu: driver: Refactor qemuDomainHelperGetVcpus (Peter Krempa) - qemu: Add helper to retrieve vCPU pid (Peter Krempa) - qemu: Replace checking for vcpu<->pid mapping availability with a helper (Peter Krempa) - qemu: Drop checking vcpu threads in emulator bandwidth getter/setter (Peter Krempa) - qemu: cgroup: Remove now unreachable check (Peter Krempa) - conf: Add helper to get pointer to a certain vCPU definition (Peter Krempa) - conf: ABI: Split up and improve vcpu info ABI checking (Peter Krempa) - conf: turn def->vcpus into a structure (Peter Krempa) - qemu: refactor qemuDomainHotunplugVcpus (Peter Krempa) - qemu: Refactor qemuDomainHotplugVcpus (Peter Krempa) - qemu: cpu hotplug: Move loops to qemuDomainSetVcpusFlags (Peter Krempa) - qemu: monitor: Remove weird return values from qemuMonitorSetCPU (Peter Krempa) - qemu: Split up vCPU hotplug and hotunplug (Peter Krempa) - qemu: Extract vCPU onlining/offlining via agent into a separate function (Peter Krempa) - qemu: domain: Add helper to access vm->privateData->agent (Peter Krempa) - conf: Turn def->maxvcpus into size_t (Peter Krempa) - conf: Replace read accesses to def->vcpus with accessor (Peter Krempa) - conf: Move vcpu count check into helper (Peter Krempa) - conf: Replace writes to def->vcpus with accessor (Peter Krempa) - conf: Replace read access to def->maxvcpus with accessor (Peter Krempa) - conf: Add helper to check whether domain has offline vCPUs (Peter Krempa) - conf: Extract update of vcpu count if maxvcpus is decreased (Peter Krempa) - conf: Use local copy of maxvcpus in virDomainVcpuParse (Peter Krempa) - conf: Replace writes to def->maxvcpus with accessor (Peter Krempa) - xen: use virDomainDefPostParse for parsing XM/XL/SEXPR cofings (Pavel Hrdina) - lxc: use virDomainDefPostParse for parsing LXC config string (Pavel Hrdina) - vmware/vmx: use virDomainDefPostParse after parsing vmx config (Pavel Hrdina) - virsh: rename vshCommandOptString to vshCommandOptStringQuiet (Ján Tomko) - security_selinux: fix indentation (Ján Tomko) - security_dac: check if virSecurityDACGetIds returns negative (Ján Tomko) Thanks everybody for helping with this release, be it with bug reports patches, reviews, documentation and ideas ! Enjoy ! 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/

2 2

[libvirt] Trying to debug "Received unexpected event 3" from libvirt
by Yaniv Kaul 16 Jan '16

16 Jan '16

Hi, I'm trying to debug this issue, which may be affecting my inability to perform live snapshot. 1. I'm not sure what 'Waking up a tragedian" in the debug log means - what exactly is a tragedian? 2. In any case, it'd be great if the WARN would mention mon->await_event - is it the event libvirt is actually waiting for? (Both from qemu/qemu_agent.c) 3. I reckon event 3 is QEMU_AGENT_EVENT_RESET ? (from qemu/qemu_agent.h) 4. I'm also getting 'End of file while reading data: Input/output error' messages, not sure what they mean yet. (using 1.2.18.2-1 on FC23, trying to live-snapshot VMs (with Centos 6 & 7 in them, all with qemu guest agent, AFAIK). TIA, Y.

2 5

[libvirt] [PATCH 0/3] Misc fixes
by Cédric Bosdonnat 15 Jan '16

15 Jan '16

Hi all, Here are a few patches without strong connection together. The first one only allows us not to package virt-login-shell even with lxc driver enabled. The other ones are related to mounts security. I'm wondering if changing the default dropped capabilities in the lxc driver is acceptable... dropping sys_admin makes sense, but it can introduce incompatibilities for users needing it as they will need to explicitely enable it. Cédric Bosdonnat (3): Allow building lxc without virt-login-shell virt-aa-helper: don't deny writes to readonly mounts lxc: drop sys_admin caps by default configure.ac | 14 ++++++++++++++ src/lxc/lxc_container.c | 1 + src/security/virt-aa-helper.c | 5 ++++- tools/Makefile.am | 12 ++++++------ 4 files changed, 25 insertions(+), 7 deletions(-) -- 2.1.4

5 8

[libvirt] [PATCH v2 0/4] Adjustment to recent cgroup/cpuset changes (for 1.3.1)
by John Ferlan 15 Jan '16

15 Jan '16

v1: http://www.redhat.com/archives/libvir-list/2016-January/msg00511.html As discussed during the replies of the v1 - revert Henning's first two patches, plus the one I made as a result of those. Patch 4/4 is already ACK'd John Ferlan (4): Revert "qemu: do not put a task into machine cgroup" Revert "util: cgroups do not implicitly add task to new machine cgroup" Revert "lxc_cgroup: Add check for NULL cgroup before AddTask call" cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup src/lxc/lxc_cgroup.c | 13 +------------ src/qemu/qemu_cgroup.c | 9 +-------- src/qemu/qemu_process.c | 12 ++++++------ src/util/vircgroup.c | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 26 deletions(-) -- 2.5.0

3 8

[libvirt] [PATCH] security: Do not restore labels on device tree binary
by Jiri Denemark 15 Jan '16

15 Jan '16

A device tree binary file specified by /domain/os/dtb element is a read-only resource similar to kernel and initrd files. We shouldn't restore its label when destroying a domain to avoid breaking other domains configure with the same device tree. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/security/security_dac.c | 4 ---- src/security/security_selinux.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 378b922..a09aba5 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1128,10 +1128,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0) rc = -1; - if (def->os.dtb && - virSecurityDACRestoreFileLabel(priv, def->os.dtb) < 0) - rc = -1; - return rc; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 475cdbc..9e98635 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2034,10 +2034,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr, virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram) < 0) rc = -1; - if (def->os.dtb && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb) < 0) - rc = -1; - return rc; } -- 2.7.0

2 1

[libvirt] [PATCH] Fix make check with gcc version 5
by Martin Kletzander 15 Jan '16

15 Jan '16

When building with gcc-5 (particularly gcc-5.3.0 now) and having pdwtags installed (package dwarves) make check fails with the following error: $ make lock_protocol-struct GEN lock_protocol-struct --- lock_protocol-structs 2016-01-13 15:04:59.318809607 +0100 +++ lock_protocol-struct-t3 2016-01-13 15:05:17.703501234 +0100 @@ -26,10 +26,6 @@ virLockSpaceProtocolNonNullString name; u_int flags; }; -enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, -}; struct virLockSpaceProtocolAcquireResourceArgs { virLockSpaceProtocolNonNullString path; virLockSpaceProtocolNonNullString name; Makefile:10415: recipe for target 'lock_protocol-struct' failed make: *** [lock_protocol-struct] Error 1 That happens because without any specific options gcc doesn't keep enum information in the resulting binary object. I managed to isolate the parameters of gcc that caused this issue to disappear, however I remember that they influenced the resulting binaries quite a bit and were definitely not something we would want to add as mandatory to the build process. So to deal with this cleanly, let's take that enum and separate it out to its own header file. Since it is only used in the lockd driver and the protocol, lock_driver_lockd.h feels like a suitable name. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/Makefile.am | 1 + src/lock_protocol-structs | 4 ---- src/locking/lock_driver_lockd.c | 2 ++ src/locking/lock_driver_lockd.h | 30 ++++++++++++++++++++++++++++++ src/locking/lock_protocol.x | 6 +----- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 src/locking/lock_driver_lockd.h diff --git a/src/Makefile.am b/src/Makefile.am index aa5ab6929b91..0e0db9bac6da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -249,6 +249,7 @@ MAINTAINERCLEANFILES += $(LOCK_DAEMON_GENERATED) LOCK_DRIVER_LOCKD_SOURCES = \ locking/lock_driver_lockd.c \ + locking/lock_driver_lockd.h \ $(NULL) LOCK_DAEMON_SOURCES = \ diff --git a/src/lock_protocol-structs b/src/lock_protocol-structs index 8e8b84fb3b50..41be9ce34717 100644 --- a/src/lock_protocol-structs +++ b/src/lock_protocol-structs @@ -26,10 +26,6 @@ struct virLockSpaceProtocolDeleteResourceArgs { virLockSpaceProtocolNonNullString name; u_int flags; }; -enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, -}; struct virLockSpaceProtocolAcquireResourceArgs { virLockSpaceProtocolNonNullString path; virLockSpaceProtocolNonNullString name; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 5b89ca142b0b..181261170506 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -34,6 +34,8 @@ #include "configmake.h" #include "virstring.h" +#include "lock_driver_lockd.h" + #define VIR_FROM_THIS VIR_FROM_LOCKING VIR_LOG_INIT("locking.lock_driver_lockd"); diff --git a/src/locking/lock_driver_lockd.h b/src/locking/lock_driver_lockd.h new file mode 100644 index 000000000000..baf346adaf6c --- /dev/null +++ b/src/locking/lock_driver_lockd.h @@ -0,0 +1,30 @@ +/* + * lock_driver_lockd.h: Locking for domain lifecycle operations + * + * Copyright (C) 2010-2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#ifndef __VIR_LOCK_DRIVER_LOCKD_H__ +# define __VIR_LOCK_DRIVER_LOCKD_H__ + +enum virLockSpaceProtocolAcquireResourceFlags { + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, +}; + +#endif /* __VIR_LOCK_DRIVER_LOCKD_H__ */ diff --git a/src/locking/lock_protocol.x b/src/locking/lock_protocol.x index a77a78490cb6..6d4cec39e244 100644 --- a/src/locking/lock_protocol.x +++ b/src/locking/lock_protocol.x @@ -2,6 +2,7 @@ */ %#include "internal.h" +%#include "lock_driver_lockd.h" typedef opaque virLockSpaceProtocolUUID[VIR_UUID_BUFLEN]; @@ -50,11 +51,6 @@ struct virLockSpaceProtocolDeleteResourceArgs { unsigned int flags; }; -enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2 -}; - struct virLockSpaceProtocolAcquireResourceArgs { virLockSpaceProtocolNonNullString path; virLockSpaceProtocolNonNullString name; -- 2.7.0

2 1

[libvirt] [PATCH] security: Do not restore kernel and initrd labels
by Jiri Denemark 15 Jan '16

15 Jan '16

Kernel/initrd files are essentially read-only shareable images and thus should be handled in the same way. We already use the appropriate label for kernel/initrd files when starting a domain, but when a domain gets destroyed we would remove the labels which would make other running domains using the same files very unhappy. https://bugzilla.redhat.com/show_bug.cgi?id=921135 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/security/security_dac.c | 8 -------- src/security/security_selinux.c | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 80709fe..378b922 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1128,14 +1128,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0) rc = -1; - if (def->os.kernel && - virSecurityDACRestoreFileLabel(priv, def->os.kernel) < 0) - rc = -1; - - if (def->os.initrd && - virSecurityDACRestoreFileLabel(priv, def->os.initrd) < 0) - rc = -1; - if (def->os.dtb && virSecurityDACRestoreFileLabel(priv, def->os.dtb) < 0) rc = -1; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 721c451..475cdbc 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2034,14 +2034,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr, virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram) < 0) rc = -1; - if (def->os.kernel && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.kernel) < 0) - rc = -1; - - if (def->os.initrd && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.initrd) < 0) - rc = -1; - if (def->os.dtb && virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb) < 0) rc = -1; -- 2.7.0

4 5

[libvirt] Entering freeze for libvirt-1.3.1
by Daniel Veillard 15 Jan '16

15 Jan '16

As suggested this w.e., I just tagged the release candidate 1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ This works fine with my limited testing, but obviously more people need to give it some trial especially on other platforms. The output from CentOS CI is mostly green which is a good sign with just libvirt-daemon-rpm and virt-manager-test in the red, someone probably need to have a look before we release. The rc2 should come in 2 days on Thursday, and unless there is some blocker I plan to push 1.3.1 over the week-end, so please give it some testing ! Thanks, 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/

4 9

[libvirt] Quantifying libvirt errors in launching the libguestfs appliance
by Richard W.M. Jones 15 Jan '16

15 Jan '16

As people may know, we frequently encounter errors caused by libvirt when running the libguestfs appliance. I wanted to find out exactly how frequently these happen and classify the errors, so I ran the 'virt-df' tool overnight 1700 times. This tool runs several parallel qemu:///session libvirt connections both creating a short-lived appliance guest. Note that I have added Cole's patch to fix https://bugzilla.redhat.com/1271183 "XML-RPC error : Cannot write data: Transport endpoint is not connected" Results: The test failed 538 times (32% of the time), which is pretty dismal. To be fair, virt-df is aggressive about how it launches parallel libvirt connections. Most other virt-* tools use only a single libvirt connection and are consequently more reliable. Of the failures, 518 (96%) were of the form: process exited while connecting to monitor: qemu: could not load kernel '/home/rjones/d/libguestfs/tmp/.guestfs-1000/appliance.d/kernel': Permission denied which is https://bugzilla.redhat.com/921135 or maybe https://bugzilla.redhat.com/1269975. It's not clear to me if these bugs have different causes, but if they do then potentially we're seeing a mix of both since my test has no way to distinguish them. 19 of the failures (4%) were of the form: process exited while connecting to monitor: fread() failed which I believe is a previously unknown bug. I have filed it as https://bugzilla.redhat.com/1298122 Finally there was 1 failure: Unable to read from monitor: Connection reset by peer which I believe is also a new bug. I have filed it as https://bugzilla.redhat.com/1298124 I would be good if libvirt could routinely test the case of multiple parallel launches of qemu:///session, since it still contains bugs even after Cole's fixes. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

7 15

[libvirt] [REPOST 0/4] Adjustment to recent cgroup/cpuset changes (for 1.3.1)
by John Ferlan 14 Jan '16

14 Jan '16

Reposting my cgroup fixes series: http://www.redhat.com/archives/libvir-list/2016-January/msg00236.html partially because I originally forgot to CC the author (Henning Schild) of the original series for which these patch fix a couple of issues discovered during regression testing (virt-test memtune failures in Red Hat regression environment), but also to bring them up to date with the top of libvirt git. NB: I did send Henning the changes after the fact, but my resend using the same message-id skills so that replies are left in the onlist series are lacking. Henning has looked at the first patch - with a response here: http://www.redhat.com/archives/libvir-list/2016-January/msg00443.html Finally, I think these changes should go into 1.3.1 since that's when the regression was introduced. John Ferlan (4): cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup qemu: Add check for NULL cgroup return from virCgroupNewMachine Revert "qemu: do not put a task into machine cgroup" qemu: Put the emulator cgroup pid into the right task file src/qemu/qemu_cgroup.c | 18 +++++++++++++----- src/qemu/qemu_process.c | 12 ++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) -- 2.5.0

4 22

[libvirt] [PATCH v4 0/7] Per domain bandwidth settings
by Alexander Burluka 14 Jan '16

14 Jan '16

We decide to make a global per domain bandwidth setting as were discussed in mailing list earlier. This patchset implements hierarchy top level cpu.cfs_period_us and cpu.cfs_quota_us control knob. I've named this parameters as global_period and global_quota. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Changes in v4: fix little rebase error Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 ++++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 68 ++++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 102 ++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 10 files changed, 251 insertions(+), 16 deletions(-) -- 1.8.3.1

1 7

[libvirt] [PATCH v3 0/7] Per domain bandwidth settings
by Alexander Burluka 14 Jan '16

14 Jan '16

We decide to make a global per domain bandwidth setting as were discussed in mailing list earlier. This patchset implements hierarchy top level cpu.cfs_period_us and cpu.cfs_quota_us control knob. I've named this parameters as global_period and global_quota. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 ++++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 68 ++++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 102 ++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 10 files changed, 251 insertions(+), 16 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH v2 0/8] Per domain bandwidth settings
by Alexander Burluka 14 Jan '16

14 Jan '16

We decide to make a global per domain bandwidth setting as were discussed in mailing list earlier. This patchset implements hierarchy top level cpu.cfs_period_us and cpu.cfs_quota_us control knob. I've named this parameters as global_period and global_quota. Changes in v2: add XML validation test Alexander Burluka (8): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Add new cgroup thread type Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 ++ include/libvirt/libvirt-domain.h | 32 ++++++ src/conf/domain_conf.c | 37 +++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 78 +++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 125 +++++++++++++++++++++++- src/qemu/qemu_process.c | 4 + src/util/vircgroup.c | 4 + src/util/vircgroup.h | 1 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 12 files changed, 289 insertions(+), 16 deletions(-) -- 1.8.3.1

3 15

[libvirt] [RFC] memory settings interface for containers
by Nikolay Shirokovskiy 14 Jan '16

14 Jan '16

Hi, everyone. I plan to add means to configure vz containers memory setting and have trouble getting it done thru libvirt interface. Looks like current interface fits good for vm memory managment but its not clear how to use it with containers. First let's take aside memory hotplugging which is obviously not suitable for containers. Then memory interface is represented by 2 parameters: total_memory and cur_balloon. For VMs total_memory can't be changed at runtime, cur_ballon can't be greater than total_memory. But for containers memory model is different. We have only one parameter and it can be changed for running domains. So question is how to map this model to existing interface (it is unlikely to have a new interface for this case). I plan to make both parameters to have same meaning and be equal for containers and update virsh, API and xml model documentation accordingly. I'd be happy to hear core developers opinions on this topic.

4 10

[libvirt] [PATCH 0/7] Per domain bandwidth settings
by Alexander Burluka 14 Jan '16

14 Jan '16

We decide to make a global per domain bandwidth setting as were discussed in mailing list earlier. This patchset implements hierarchy top level cpu.cfs_period_us and cpu.cfs_quota_us control knob. I've named this parameters as global_period and global_quota. Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add new cgroup thread type Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 ++++ include/libvirt/libvirt-domain.h | 32 ++++++++++ src/conf/domain_conf.c | 37 ++++++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 78 +++++++++++++++++++++--- src/qemu/qemu_cgroup.h | 7 ++- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 125 +++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 ++ src/util/vircgroup.c | 4 ++ src/util/vircgroup.h | 1 + 11 files changed, 287 insertions(+), 16 deletions(-) -- 1.8.3.1

4 16

[libvirt] [PATCH] conf: Initialize 'deflate' for balloon parse XML
by John Ferlan 14 Jan '16

14 Jan '16

Commit id '7bf3198df' neglected to initialize deflate leading to a possibility if model allocation/checks fail, then the VIR_FREE(deflate) would be erroneous. Noted by Jan Tomko. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I would have pushed as trivial, but it still wasn't 100% clear that this was the only 'issue' Jan was concerned about... src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e78da1..a9706b0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11354,7 +11354,7 @@ virDomainMemballoonDefParseXML(xmlNodePtr node, unsigned int flags) { char *model; - char *deflate; + char *deflate = NULL; virDomainMemballoonDefPtr def; xmlNodePtr save = ctxt->node; unsigned int period = 0; -- 2.5.0

2 1

[libvirt] [PATCH 0/8] qemu: Start dropping support for !QEMU_CAPS_DEVICE
by Cole Robinson 14 Jan '16

14 Jan '16

libvirt only supports qemu 0.12.0+ nowadays, which means that the qemu binary always provides the -device/QEMU_CAPS_DEVICE option. This patch series is a step towards dropping support for that flag. Patch #1 is a test suite improvement, not strictly related Patch #2-5 adjust the test suite for -device always being present Remaining patches drop a bunch of qemu driver code qemu_command.c is not touched yet... it's a bit more work to there, since we still need to preserve some old style cli codepaths for emulators/machinetypes that don't work with -device Not for 1.3.1, but it would be nice to get these ACKd so I can push them right after the release, since conflicts will creep in. Cole Robinson (8): tests: Run test-wrap-argv with REGENERATE_OUTPUT tests: qemuxml2xml: Always use different output file tests: qemuargv2xml: separate from qemuxml2argv data tests: qemuxml2argv: remove some QEMU_CAPS_DEVICE problem cases tests: qemuxml2argv: Unconditionally enable QEMU_CAPS_DEVICE qemu: process: Drop !QEMU_CAPS_DEVICE code qemu: hotplug: Drop !QEMU_CAPS_DEVICE code qemu: monitor: drop now unused hmp monitor commands src/qemu/qemu_hotplug.c | 480 +++++----------- src/qemu/qemu_monitor.c | 161 ------ src/qemu/qemu_monitor.h | 49 -- src/qemu/qemu_monitor_json.c | 88 --- src/qemu/qemu_monitor_json.h | 33 -- src/qemu/qemu_monitor_text.c | 601 --------------------- src/qemu/qemu_monitor_text.h | 39 -- src/qemu/qemu_process.c | 471 +--------------- tests/Makefile.am | 1 + tests/domainschematest | 2 +- .../qemuargv2xmldata/qemuargv2xml-boot-cdrom.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 29 + .../qemuargv2xmldata/qemuargv2xml-boot-floppy.args | 23 + .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 35 ++ .../qemuargv2xml-boot-network.args | 22 + .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 28 + .../qemuargv2xml-clock-localtime.args | 23 + .../qemuargv2xml-clock-localtime.xml | 28 + .../qemuargv2xml-clock-utc.args} | 5 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 28 + .../qemuargv2xml-console-compat.args | 22 + .../qemuargv2xml-console-compat.xml | 34 ++ .../qemuargv2xml-disk-cdrom-empty.args | 23 + .../qemuargv2xml-disk-cdrom-empty.xml | 34 ++ .../qemuargv2xmldata/qemuargv2xml-disk-cdrom.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 35 ++ .../qemuargv2xml-disk-drive-boot-cdrom.args | 23 + .../qemuargv2xml-disk-drive-boot-cdrom.xml | 34 ++ .../qemuargv2xml-disk-drive-boot-disk.args | 23 + .../qemuargv2xml-disk-drive-boot-disk.xml | 34 ++ .../qemuargv2xml-disk-drive-cache-directsync.args | 24 + .../qemuargv2xml-disk-drive-cache-directsync.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-unsafe.args | 23 + .../qemuargv2xml-disk-drive-cache-unsafe.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-v2-none.args | 23 + .../qemuargv2xml-disk-drive-cache-v2-none.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-v2-wb.args | 24 + .../qemuargv2xml-disk-drive-cache-v2-wb.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-v2-wt.args | 24 + .../qemuargv2xml-disk-drive-cache-v2-wt.xml | 35 ++ ...uargv2xml-disk-drive-error-policy-enospace.args | 24 + ...muargv2xml-disk-drive-error-policy-enospace.xml | 35 ++ .../qemuargv2xml-disk-drive-error-policy-stop.args | 24 + .../qemuargv2xml-disk-drive-error-policy-stop.xml | 35 ++ ...ml-disk-drive-error-policy-wreport-rignore.args | 24 + ...xml-disk-drive-error-policy-wreport-rignore.xml | 35 ++ .../qemuargv2xml-disk-drive-fmt-qcow.args | 23 + .../qemuargv2xml-disk-drive-fmt-qcow.xml | 35 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 24 + .../qemuargv2xml-disk-drive-network-gluster.xml | 35 ++ ...qemuargv2xml-disk-drive-network-iscsi-auth.args | 25 + .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 38 ++ .../qemuargv2xml-disk-drive-network-iscsi.args | 25 + .../qemuargv2xml-disk-drive-network-iscsi.xml | 35 ++ ...qemuargv2xml-disk-drive-network-nbd-export.args | 23 + .../qemuargv2xml-disk-drive-network-nbd-export.xml | 35 ++ ...rgv2xml-disk-drive-network-nbd-ipv6-export.args | 23 + ...argv2xml-disk-drive-network-nbd-ipv6-export.xml | 35 ++ .../qemuargv2xml-disk-drive-network-nbd-ipv6.args | 23 + .../qemuargv2xml-disk-drive-network-nbd-ipv6.xml | 35 ++ .../qemuargv2xml-disk-drive-network-nbd-unix.args | 23 + .../qemuargv2xml-disk-drive-network-nbd-unix.xml | 35 ++ .../qemuargv2xml-disk-drive-network-nbd.args | 23 + .../qemuargv2xml-disk-drive-network-nbd.xml | 35 ++ .../qemuargv2xml-disk-drive-network-rbd-auth.args | 26 + .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 40 ++ ...muargv2xml-disk-drive-network-rbd-ceph-env.args | 25 + ...emuargv2xml-disk-drive-network-rbd-ceph-env.xml | 37 ++ .../qemuargv2xml-disk-drive-network-rbd-ipv6.args | 25 + .../qemuargv2xml-disk-drive-network-rbd-ipv6.xml | 38 ++ .../qemuargv2xml-disk-drive-network-rbd.args | 29 + .../qemuargv2xml-disk-drive-network-rbd.xml | 62 +++ .../qemuargv2xml-disk-drive-network-sheepdog.args | 23 + .../qemuargv2xml-disk-drive-network-sheepdog.xml | 35 ++ .../qemuargv2xmldata/qemuargv2xml-disk-floppy.args | 24 + .../qemuargv2xmldata/qemuargv2xml-disk-floppy.xml | 41 ++ tests/qemuargv2xmldata/qemuargv2xml-disk-many.args | 25 + tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml | 46 ++ .../qemuargv2xml-disk-usb.args} | 0 .../qemuargv2xml-disk-usb.xml} | 0 .../qemuargv2xmldata/qemuargv2xml-disk-virtio.args | 25 + .../qemuargv2xmldata/qemuargv2xml-disk-virtio.xml | 45 ++ .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 + .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 45 ++ .../qemuargv2xml-graphics-sdl-fullscreen.args | 25 + .../qemuargv2xml-graphics-sdl-fullscreen.xml | 34 ++ .../qemuargv2xml-graphics-sdl.args | 24 + .../qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml | 34 ++ .../qemuargv2xml-graphics-vnc-policy.args | 23 + .../qemuargv2xml-graphics-vnc-policy.xml | 36 ++ .../qemuargv2xml-graphics-vnc-sasl.args | 24 + .../qemuargv2xml-graphics-vnc-sasl.xml | 36 ++ .../qemuargv2xml-graphics-vnc-socket.args | 23 + .../qemuargv2xml-graphics-vnc-socket.xml | 34 ++ .../qemuargv2xml-graphics-vnc-tls.args | 24 + .../qemuargv2xml-graphics-vnc-tls.xml | 36 ++ .../qemuargv2xml-graphics-vnc-websocket.args | 22 + .../qemuargv2xml-graphics-vnc-websocket.xml | 29 + .../qemuargv2xml-graphics-vnc.args | 23 + .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 36 ++ .../qemuargv2xml-hostdev-pci-address.args | 23 + .../qemuargv2xml-hostdev-pci-address.xml | 33 ++ .../qemuargv2xml-hostdev-usb-address.args | 23 + .../qemuargv2xml-hostdev-usb-address.xml | 33 ++ .../qemuargv2xml-hyperv-panic.args | 21 + .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 25 + tests/qemuargv2xmldata/qemuargv2xml-hyperv.args | 21 + tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 29 + .../qemuargv2xml-input-usbmouse.args | 23 + .../qemuargv2xml-input-usbmouse.xml | 29 + .../qemuargv2xml-input-usbtablet.args | 23 + .../qemuargv2xml-input-usbtablet.xml | 29 + .../qemuargv2xml-kvm-features.args | 21 + .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 27 + tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 26 + .../qemuargv2xml-machine-aeskeywrap-off-argv.args | 20 + .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 27 + .../qemuargv2xml-machine-aeskeywrap-on-argv.args | 20 + .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 27 + .../qemuargv2xml-machine-core-off.args | 22 + .../qemuargv2xml-machine-core-off.xml | 28 + .../qemuargv2xml-machine-core-on.args | 22 + .../qemuargv2xml-machine-core-on.xml | 28 + .../qemuargv2xml-machine-deakeywrap-off-argv.args | 20 + .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 27 + .../qemuargv2xml-machine-deakeywrap-on-argv.args | 20 + .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 27 + .../qemuargv2xml-machine-keywrap-none-argv.args | 20 + .../qemuargv2xml-machine-keywrap-none-argv.xml} | 13 +- tests/qemuargv2xmldata/qemuargv2xml-migrate.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-migrate.xml | 28 + tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args | 21 + tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml | 31 ++ .../qemuargv2xml-misc-disable-s3.args | 23 + .../qemuargv2xml-misc-disable-s3.xml | 31 ++ .../qemuargv2xml-misc-disable-suspends.args | 24 + .../qemuargv2xml-misc-disable-suspends.xml | 32 ++ .../qemuargv2xml-misc-enable-s4.args | 23 + .../qemuargv2xml-misc-enable-s4.xml | 31 ++ .../qemuargv2xml-misc-no-reboot.args | 23 + .../qemuargv2xml-misc-no-reboot.xml | 28 + tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args | 21 + tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml | 31 ++ .../qemuargv2xml-net-eth-ifname.args | 23 + .../qemuargv2xml-net-eth-ifname.xml | 34 ++ tests/qemuargv2xmldata/qemuargv2xml-net-eth.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 33 ++ tests/qemuargv2xmldata/qemuargv2xml-net-user.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-net-user.xml | 32 ++ .../qemuargv2xmldata/qemuargv2xml-net-virtio.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml | 32 ++ .../qemuargv2xml-nographics-vga.args | 23 + .../qemuargv2xml-nographics-vga.xml | 28 + .../qemuargv2xml-nosharepages.args | 22 + .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 31 ++ .../qemuargv2xml-parallel-tcp.args | 22 + .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 33 ++ .../qemuargv2xml-pseries-disk.args | 18 + .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 42 ++ .../qemuargv2xml-pseries-nvram.args | 22 + .../qemuargv2xml-pseries-nvram.xml | 25 + .../qemuargv2xml-qemu-ns-no-env.args | 23 + .../qemuargv2xml-qemu-ns-no-env.xml | 32 ++ .../qemuargv2xml-reboot-timeout-disabled.args | 21 + .../qemuargv2xml-reboot-timeout-disabled.xml | 22 + .../qemuargv2xml-reboot-timeout-enabled.args | 21 + .../qemuargv2xml-reboot-timeout-enabled.xml | 22 + .../qemuargv2xmldata/qemuargv2xml-restore-v2.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml | 28 + .../qemuargv2xmldata/qemuargv2xml-serial-dev.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 36 ++ .../qemuargv2xmldata/qemuargv2xml-serial-file.args | 22 + .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 36 ++ .../qemuargv2xmldata/qemuargv2xml-serial-many.args | 23 + .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 38 ++ .../qemuargv2xmldata/qemuargv2xml-serial-pty.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 34 ++ .../qemuargv2xml-serial-tcp-telnet.args | 22 + .../qemuargv2xml-serial-tcp-telnet.xml | 38 ++ .../qemuargv2xmldata/qemuargv2xml-serial-tcp.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 38 ++ .../qemuargv2xmldata/qemuargv2xml-serial-udp.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 42 ++ .../qemuargv2xmldata/qemuargv2xml-serial-unix.args | 22 + .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 36 ++ tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 34 ++ tests/qemuargv2xmldata/qemuargv2xml-smp.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-smp.xml | 31 ++ tests/qemuargv2xmldata/qemuargv2xml-sound.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-sound.xml | 32 ++ tests/qemuargv2xmldata/qemuargv2xml-watchdog.args | 24 + tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 29 + tests/qemuargv2xmltest.c | 4 +- .../qemuxml2argv-blkiotune-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 10 +- .../qemuxml2argv-boot-menu-disable.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 8 +- .../qemuxml2argv-boot-network.args | 7 +- .../qemuxml2argv-clock-catchup.args | 8 +- .../qemuxml2argv-clock-france.args | 8 +- .../qemuxml2argv-clock-hpet-off.args | 8 +- ...muxml2argv-clock-localtime-basis-localtime.args | 8 +- .../qemuxml2argv-clock-localtime.args | 7 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 8 +- .../qemuxml2argv-clock-variable.args | 8 +- .../qemuxml2argv-console-compat-auto.args | 7 +- .../qemuxml2argv-console-compat.args | 8 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 5 +- .../qemuxml2argv-cpu-Haswell2.args | 5 +- .../qemuxml2argv-cpu-Haswell3.args | 5 +- .../qemuxml2argv-cpu-eoi-disabled.args | 5 +- .../qemuxml2argv-cpu-eoi-enabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 5 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 5 +- .../qemuxml2argv-cpu-fallback.args | 5 +- .../qemuxml2argv-cpu-host-kvmclock.args | 5 +- .../qemuxml2argv-cpu-host-model-fallback.args | 5 +- .../qemuxml2argv-cpu-host-model-vendor.args | 5 +- .../qemuxml2argv-cpu-host-model.args | 5 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 8 +- .../qemuxml2argv-cpu-host-passthrough.args | 5 +- .../qemuxml2argv-cpu-kvmclock.args | 5 +- .../qemuxml2argv-cpu-minimum1.args | 5 +- .../qemuxml2argv-cpu-minimum2.args | 5 +- .../qemuxml2argv-cpu-numa-disjoint.args | 5 +- .../qemuxml2argv-cpu-numa-no-memory-element.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 5 +- .../qemuxml2argv-cpu-topology1.args | 5 +- .../qemuxml2argv-cpu-topology2.args | 5 +- .../qemuxml2argv-cpu-topology3.args | 5 +- .../qemuxml2argv-cputune-numatune.args | 7 +- .../qemuxml2argv-cputune-numatune.xml | 12 +- .../qemuxml2argv-cputune-zero-shares.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 8 +- .../qemuxml2argv-default-kvm-host-arch.args | 5 +- .../qemuxml2argv-default-qemu-host-arch.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 15 +- .../qemuxml2argv-disk-cdrom-empty.args | 10 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 11 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 10 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 11 +- .../qemuxml2argv-disk-drive-boot-disk.args | 11 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 11 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 11 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 11 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 8 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 13 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 13 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 13 +- .../qemuxml2argv-disk-drive-fat.args | 8 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 11 +- .../qemuxml2argv-disk-drive-network-gluster.args | 13 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 12 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 14 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 12 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 12 +- .../qemuxml2argv-disk-drive-network-nbd.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd.args | 26 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 12 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 13 +- .../qemuxml2argv-disk-drive-shared.args | 12 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 14 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 13 +- .../qemuxml2argv-disk-geometry.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 16 +- .../qemuxml2argv-disk-snapshot.args | 17 +- .../qemuxml2argv-disk-usb-nosupport.xml | 33 ++ .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 19 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 13 +- .../qemuxml2argv-eoi-disabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 5 +- .../qemuxml2argv-fips-enabled.args | 8 +- .../qemuxml2argv-floppy-drive-fat.args | 8 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 7 +- .../qemuxml2argv-graphics-sdl.args | 7 +- .../qemuxml2argv-graphics-vnc-policy.args | 7 +- .../qemuxml2argv-graphics-vnc-sasl.args | 7 +- .../qemuxml2argv-graphics-vnc-socket.args | 7 +- .../qemuxml2argv-graphics-vnc-tls.args | 7 +- .../qemuxml2argv-graphics-vnc-websocket.args | 4 +- .../qemuxml2argv-graphics-vnc.args | 7 +- .../qemuxml2argv-hostdev-pci-address.args | 9 +- .../qemuxml2argv-hostdev-usb-address.args | 9 +- .../qemuxml2argv-hugepages-pages.args | 8 +- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 8 +- .../qemuxml2argv-hugepages-pages5.args | 8 +- .../qemuxml2argv-hugepages-pages6.args | 8 +- .../qemuxml2argv-hugepages-shared.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 5 +- .../qemuxml2argv-hyperv-panic.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 9 +- .../qemuxml2argv-input-usbtablet.args | 9 +- .../qemuxml2argv-iothreads-ids-partial.args | 7 +- .../qemuxml2argv-iothreads-ids.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 7 +- .../qemuxml2argv-kvm-features-off.args | 5 +- .../qemuxml2argv-kvm-features.args | 6 +- .../qemuxml2argv-kvm-pit-delay.args | 8 +- .../qemuxml2argv-kvm-pit-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 6 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 6 +- .../qemuxml2argv-machine-aliases1.args | 8 +- .../qemuxml2argv-machine-aliases2.args | 8 +- .../qemuxml2argv-machine-core-off.args | 7 +- .../qemuxml2argv-machine-core-on.args | 7 +- .../qemuxml2argv-machine-usb-opt.args | 8 +- .../qemuxml2argv-machine-vmport-opt.args | 8 +- .../qemuxml2argv-memory-hotplug.args | 8 +- .../qemuxml2argv-memtune-unlimited.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 8 +- .../qemuxml2argv-migrate-numa-unaligned.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 7 +- .../qemuxml2argv-minimal-msg-timestamp.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 7 +- .../qemuxml2argv-misc-disable-s3.args | 7 +- .../qemuxml2argv-misc-disable-suspends.args | 7 +- .../qemuxml2argv-misc-enable-s4.args | 7 +- .../qemuxml2argv-misc-no-reboot.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 6 +- .../qemuxml2argv-mlock-unsupported.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 9 +- .../qemuxml2argv-net-eth-ifname.args | 10 +- .../qemuxml2argv-net-eth-names.args | 11 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 10 +- .../qemuxml2argv-nographics-vga.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 8 +- .../qemuxml2argv-nosharepages.args | 7 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 8 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 8 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 8 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 8 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 8 +- .../qemuxml2argv-numatune-auto-prefer.args | 5 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 5 +- .../qemuxml2argv-numatune-memnode.args | 5 +- .../qemuxml2argv-numatune-memory.args | 8 +- .../qemuxml2argv-parallel-tcp.args | 6 +- .../qemuxml2argv-pmu-feature-off.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 4 +- .../qemuxml2argv-pseries-nvram.args | 4 +- .../qemuxml2argv-pv-spinlock-disabled.args | 5 +- .../qemuxml2argv-pv-spinlock-enabled.args | 5 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 8 +- .../qemuxml2argv-qemu-ns-commandline.args | 8 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-domain-commandline.args | 8 +- .../qemuxml2argv-qemu-ns-domain-ns0.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 8 +- .../qemuxml2argv-reboot-timeout-disabled.args | 6 +- .../qemuxml2argv-reboot-timeout-enabled.args | 6 +- .../qemuxml2argv-restore-v2-fd.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 7 +- .../qemuxml2argv-seclabel-dac-none.args | 8 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 8 +- .../qemuxml2argv-seclabel-dynamic-override.args | 11 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic.args | 8 +- .../qemuxml2argv-seclabel-none.args | 8 +- .../qemuxml2argv-seclabel-static-labelskip.args | 8 +- .../qemuxml2argv-seclabel-static-relabel.args | 8 +- .../qemuxml2argv-seclabel-static.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 8 +- .../qemuxml2argv-serial-spiceport-nospice.args | 8 +- .../qemuxml2argv-serial-tcp-telnet.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 12 +- .../qemuxml2argv-video-qxl-nodevice.args | 14 +- .../qemuxml2argv-video-vga-nodevice.args | 12 +- .../qemuxml2argv-watchdog-dump.args | 12 +- .../qemuxml2argv-watchdog-injectnmi.args | 12 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 9 +- tests/qemuxml2argvtest.c | 571 ++++++++++---------- .../qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml | 49 ++ .../qemuxml2xmlout-aarch64-gic.xml | 32 ++ .../qemuxml2xmlout-aarch64-gicv3.xml | 32 ++ .../qemuxml2xmlout-bios-nvram.xml | 40 ++ .../qemuxml2xmlout-blkdeviotune.xml | 43 ++ .../qemuxml2xmlout-blkiotune-device.xml | 46 ++ .../qemuxml2xmlout-blkiotune.xml | 30 + .../qemuxml2xmlout-boot-cdrom.xml | 29 + .../qemuxml2xmlout-boot-floppy.xml | 35 ++ .../qemuxml2xmlout-boot-menu-disable.xml | 29 + ...emuxml2xmlout-boot-menu-enable-with-timeout.xml | 29 + .../qemuxml2xmlout-boot-multi.xml | 32 ++ .../qemuxml2xmlout-boot-network.xml | 28 + .../qemuxml2xmlout-boot-order.xml | 54 ++ .../qemuxml2xmlout-channel-guestfwd.xml | 31 ++ .../qemuxml2xmlout-channel-virtio.xml | 34 ++ .../qemuxml2xmlout-chardev-label.xml | 45 ++ .../qemuxml2xmlout-clock-catchup.xml | 37 ++ .../qemuxml2xmlout-clock-localtime.xml | 28 + .../qemuxml2xmlout-clock-timer-hyperv-rtc.xml | 26 + .../qemuxml2xmlout-clock-utc.xml | 28 + .../qemuxml2xmlout-console-compat.xml | 34 ++ .../qemuxml2xmlout-console-virtio-many.xml | 43 ++ .../qemuxml2xmlout-cpu-eoi-disabled.xml | 29 + .../qemuxml2xmlout-cpu-eoi-enabled.xml | 29 + .../qemuxml2xmlout-cpu-host-kvmclock.xml | 24 + .../qemuxml2xmlout-cpu-host-model-features.xml | 33 ++ ...emuxml2xmlout-cpu-host-passthrough-features.xml | 37 ++ .../qemuxml2xmlout-cpu-kvmclock.xml | 26 + .../qemuxml2xmlout-cpu-numa-disjoint.xml | 28 + .../qemuxml2xmlout-cpu-numa-memshared.xml | 28 + ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 38 ++ .../qemuxml2xmlout-cputune-numatune.xml | 29 + .../qemuxml2xmlout-cputune-zero-shares.xml | 35 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml | 35 ++ .../qemuxml2xmlout-disk-active-commit.xml | 37 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml | 35 ++ .../qemuxml2xmlout-disk-cdrom.xml | 35 ++ .../qemuxml2xmlout-disk-copy_on_read.xml | 51 ++ .../qemuxml2xmlout-disk-drive-copy-on-read.xml | 28 + .../qemuxml2xmlout-disk-drive-fat.xml | 29 + .../qemuxml2xmlout-disk-drive-fmt-qcow.xml | 35 ++ ...emuxml2xmlout-disk-drive-network-iscsi-auth.xml | 38 ++ .../qemuxml2xmlout-disk-drive-network-iscsi.xml | 35 ++ ...emuxml2xmlout-disk-drive-network-nbd-export.xml | 35 ++ ...l2xmlout-disk-drive-network-nbd-ipv6-export.xml | 35 ++ .../qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml | 35 ++ .../qemuxml2xmlout-disk-drive-network-nbd-unix.xml | 35 ++ .../qemuxml2xmlout-disk-drive-network-nbd.xml | 35 ++ .../qemuxml2xmlout-disk-floppy.xml | 41 ++ .../qemuxml2xmlout-disk-many.xml | 46 ++ .../qemuxml2xmlout-disk-mirror-active.xml | 56 ++ ...xml => qemuxml2xmlout-disk-mirror-inactive.xml} | 0 .../qemuxml2xmlout-disk-scsi-device.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-disk-vpd.xml | 39 ++ ...muxml2xmlout-disk-scsi-lun-passthrough-sgio.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-megasas.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-virtio-scsi.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-vscsi.xml | 33 ++ .../qemuxml2xmlout-disk-source-pool-mode.xml | 47 ++ .../qemuxml2xmlout-disk-usb-device.xml | 31 ++ ...qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml | 29 + .../qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml | 29 + ...qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml | 29 + .../qemuxml2xmlout-disk-virtio-scsi-num_queues.xml | 29 + .../qemuxml2xmlout-disk-virtio.xml | 45 ++ .../qemuxml2xmlout-disk-xenvbd.xml | 45 ++ .../qemuxml2xmlout-encrypted-disk.xml | 30 + .../qemuxml2xmlout-eoi-disabled.xml | 26 + .../qemuxml2xmlout-eoi-enabled.xml | 26 + .../qemuxml2xmlout-event_idx.xml | 51 ++ .../qemuxml2xmlout-floppy-drive-fat.xml | 30 + .../qemuxml2xmlout-graphics-listen-network.xml | 35 ++ .../qemuxml2xmlout-graphics-sdl-fullscreen.xml | 34 ++ .../qemuxml2xmlout-graphics-sdl.xml | 34 ++ .../qemuxml2xmlout-graphics-spice-compression.xml | 43 ++ .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 40 ++ .../qemuxml2xmlout-graphics-spice.xml | 47 ++ .../qemuxml2xmlout-graphics-vnc-sasl.xml | 36 ++ .../qemuxml2xmlout-graphics-vnc-tls.xml | 36 ++ .../qemuxml2xmlout-graphics-vnc-websocket.xml | 29 + .../qemuxml2xmlout-graphics-vnc.xml | 36 ++ .../qemuxml2xmlout-hostdev-pci-address.xml | 33 ++ .../qemuxml2xmlout-hostdev-scsi-large-unit.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 46 ++ .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml | 40 ++ .../qemuxml2xmlout-hostdev-scsi-lsi.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-rawio.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-readonly.xml | 36 ++ .../qemuxml2xmlout-hostdev-scsi-sgio.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-shareable.xml | 36 ++ ...muxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 46 ++ .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml | 40 ++ .../qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml | 35 ++ .../qemuxml2xmlout-hostdev-usb-address.xml | 33 ++ .../qemuxml2xmlout-hostdev-vfio.xml | 33 ++ .../qemuxml2xmlout-hugepages-pages.xml | 45 ++ .../qemuxml2xmlout-hugepages-pages2.xml | 38 ++ .../qemuxml2xmlout-hugepages-pages3.xml | 38 ++ .../qemuxml2xmlout-hugepages-shared.xml | 45 ++ .../qemuxml2xmlout-hugepages.xml | 30 + .../qemuxml2xmlout-hyperv-off.xml | 29 + .../qemuxml2xmlout-hyperv-panic.xml | 25 + tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml | 29 + .../qemuxml2xmlout-input-usbmouse.xml | 29 + .../qemuxml2xmlout-input-usbtablet.xml | 29 + .../qemuxml2xmlout-interface-driver.xml | 52 ++ .../qemuxml2xmlout-interface-server.xml | 134 +++++ .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 34 ++ .../qemuxml2xmlout-iothreads-disk.xml | 40 ++ .../qemuxml2xmlout-iothreads-ids-partial.xml | 33 ++ .../qemuxml2xmlout-iothreads-ids.xml | 33 ++ .../qemuxml2xmlout-iothreads.xml | 29 + .../qemuxml2xmlout-kvm-features-off.xml | 27 + .../qemuxml2xmlout-kvm-features.xml | 27 + .../qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml | 26 + tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml | 38 ++ .../qemuxml2xmlout-machine-core-off.xml | 28 + .../qemuxml2xmlout-machine-core-on.xml | 28 + .../qemuxml2xmlout-memory-hotplug-dimm.xml | 54 ++ .../qemuxml2xmlout-memory-hotplug-nonuma.xml | 22 + .../qemuxml2xmlout-memory-hotplug.xml | 34 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml | 32 ++ .../qemuxml2xmlout-misc-acpi.xml | 31 ++ .../qemuxml2xmlout-misc-disable-s3.xml | 31 ++ .../qemuxml2xmlout-misc-disable-suspends.xml | 32 ++ .../qemuxml2xmlout-misc-enable-s4.xml | 31 ++ .../qemuxml2xmlout-misc-no-reboot.xml | 28 + .../qemuxml2xmlout-net-bandwidth.xml | 76 +++ .../qemuxml2xmlout-net-bandwidth2.xml | 65 +++ .../qemuxml2xmlout-net-eth-ifname.xml | 34 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 33 ++ .../qemuxml2xmlout-net-hostdev-vfio.xml | 41 ++ .../qemuxml2xmlout-net-hostdev.xml | 40 ++ .../qemuxml2xmlout-net-midonet.xml | 35 ++ .../qemuxml2xmlout-net-openvswitch.xml | 40 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml | 34 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml | 32 ++ .../qemuxml2xmlout-net-vhostuser.xml | 43 ++ .../qemuxml2xmlout-net-virtio-device.xml | 32 ++ .../qemuxml2xmlout-net-virtio-disable-offloads.xml | 35 ++ ...qemuxml2xmlout-net-virtio-network-portgroup.xml | 54 ++ .../qemuxml2xmlout-net-virtio.xml | 32 ++ .../qemuxml2xmlout-nosharepages.xml | 31 ++ ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 30 + .../qemuxml2xmlout-numatune-memnode-no-memory.xml | 30 + .../qemuxml2xmlout-panic-double.xml | 28 + .../qemuxml2xmlout-panic-isa.xml | 31 ++ .../qemuxml2xmlout-panic-no-address.xml | 29 + .../qemuxml2xmlout-panic-pseries.xml | 30 + .../qemuxml2xmlout-parallel-tcp.xml | 33 ++ .../qemuxml2xmlout-pci-bridge.xml | 211 ++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml | 49 ++ .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 37 ++ .../qemuxml2xmlout-pcie-root-port-too-many.xml | 60 ++ .../qemuxml2xmlout-pcie-root-port.xml | 36 ++ .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 44 ++ .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 37 ++ .../qemuxml2xmlout-pcihole64-none.xml | 23 + .../qemuxml2xmlout-pcihole64-q35.xml | 33 ++ .../qemuxml2xmlout-pcihole64.xml | 23 + .../qemuxml2xmlout-pmu-feature-off.xml | 25 + .../qemuxml2xmlout-pseries-nvram.xml | 25 + .../qemuxml2xmlout-pv-spinlock-disabled.xml | 26 + .../qemuxml2xmlout-pv-spinlock-enabled.xml | 26 + .../qemuxml2xmlout-reboot-timeout-disabled.xml | 22 + .../qemuxml2xmlout-reboot-timeout-enabled.xml | 22 + .../qemuxml2xmlout-seclabel-dac-none.xml | 28 + .../qemuxml2xmlout-seclabel-device-multiple.xml | 32 ++ .../qemuxml2xmlout-seclabel-dynamic-baselabel.xml | 30 + .../qemuxml2xmlout-seclabel-dynamic-none.xml | 28 + .../qemuxml2xmlout-seclabel-dynamic-override.xml | 42 ++ .../qemuxml2xmlout-seclabel-static-labelskip.xml | 34 ++ .../qemuxml2xmlout-seclabel-static.xml | 30 + .../qemuxml2xmlout-serial-dev.xml | 36 ++ .../qemuxml2xmlout-serial-file.xml | 36 ++ .../qemuxml2xmlout-serial-many.xml | 38 ++ .../qemuxml2xmlout-serial-pty.xml | 34 ++ .../qemuxml2xmlout-serial-spiceport-nospice.xml | 35 ++ .../qemuxml2xmlout-serial-spiceport.xml | 44 ++ .../qemuxml2xmlout-serial-tcp-telnet.xml | 38 ++ .../qemuxml2xmlout-serial-tcp.xml | 38 ++ .../qemuxml2xmlout-serial-udp.xml | 42 ++ .../qemuxml2xmlout-serial-unix.xml | 36 ++ .../qemuxml2xmlout-serial-vc.xml | 34 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 52 ++ .../qemuxml2xmlout-smbios-multiple-type2.xml | 58 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml | 51 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml | 31 ++ .../qemuxml2xmlout-sound-device.xml | 42 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml | 32 ++ .../qemuxml2xmlout-tap-vhost.xml | 52 ++ .../qemuxml2xmlout-tpm-passthrough.xml | 30 + .../qemuxml2xmlout-usb-redir.xml | 42 ++ .../qemuxml2xmlout-vcpu-placement-static.xml | 37 ++ .../qemuxml2xmlout-vhost_queues.xml | 51 ++ .../qemuxml2xmlout-video-virtio-gpu-device.xml | 31 ++ .../qemuxml2xmlout-video-virtio-gpu-virgl.xml | 33 ++ .../qemuxml2xmlout-virtio-input-passthrough.xml | 24 + .../qemuxml2xmlout-virtio-input.xml | 26 + .../qemuxml2xmlout-virtio-lun.xml | 50 ++ .../qemuxml2xmlout-virtio-rng-egd.xml | 27 + .../qemuxml2xmlout-virtio-rng-random.xml | 25 + tests/qemuxml2xmltest.c | 191 +++---- tests/testutils.c | 38 +- 617 files changed, 13963 insertions(+), 3060 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-network.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml rename tests/{qemuxml2argvdata/qemuxml2argv-minimal-s390.args => qemuargv2xmldata/qemuargv2xml-clock-utc.args} (79%) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-console-compat.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-many.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.args => qemuargv2xmldata/qemuargv2xml-disk-usb.args} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.xml => qemuargv2xmldata/qemuargv2xml-disk-usb.xml} (100%) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args rename tests/{qemuxml2argvdata/qemuxml2argv-minimal-s390.xml => qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml} (53%) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-migrate.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-migrate.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-user.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-user.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-file.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-many.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-smp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-smp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-sound.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-sound.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-watchdog.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gicv3.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror.xml => qemuxml2xmlout-disk-mirror-inactive.xml} (100%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-pci-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-large-unit.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-rawio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-readonly.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-sgio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-shareable.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-usb-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-vfio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages3.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-shared.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-panic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbmouse.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbtablet.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-on.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-acpi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-s3.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-suspends.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-enable-s4.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-no-reboot.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev-vfio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-midonet.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-openvswitch.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-disable-offloads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-network-portgroup.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-nosharepages.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode-no-memory.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-double.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-isa.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-no-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-parallel-tcp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-serial-dev-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-too-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-nvram.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dac-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-device-multiple.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-baselabel.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-override.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static-labelskip.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-dev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-file.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-pty.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-telnet.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-udp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-unix.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-vc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios-multiple-type2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-sound-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-tpm-passthrough.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input-passthrough.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-egd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-random.xml -- 2.5.0

1 8

[libvirt] [PATCH] wireshark: Drop DESTDIR from install path
by Michal Privoznik 13 Jan '16

13 Jan '16

In 50078cfbcbf3c8 I've tried to fix distcheck but accidentally broke rpm build. The problem is that rpm build not only sets DESTDIR but also passes plugindir path. This results in double DESTDIR being in the plugin path, Drop one. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d38d3cb..1a6afd3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -381,7 +381,7 @@ EXTRA_DIST += \ if WITH_WIRESHARK_DISSECTOR -ws_plugindir = $(DESTDIR)$(plugindir) +ws_plugindir = $(plugindir) ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS = \ -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) -- 2.4.10

2 1

[libvirt] [PATCH] virsh: Update description of lxc-enter-namespace
by Guido Günther 13 Jan '16

13 Jan '16

Mention that we run a command in that namespace --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d239ba8..62acecb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9066,7 +9066,7 @@ static const vshCmdInfo info_lxc_enter_namespace[] = { .data = N_("LXC Guest Enter Namespace") }, {.name = "desc", - .data = N_("Run an arbitrary lxc guest enter namespace; use at your own risk") + .data = N_("Run an arbitrary command in a lxc guest namespace; use at your own risk") }, {.name = NULL} }; @@ -9080,7 +9080,7 @@ static const vshCmdOptDef opts_lxc_enter_namespace[] = { {.name = "cmd", .type = VSH_OT_ARGV, .flags = VSH_OFLAG_REQ, - .help = N_("namespace") + .help = N_("command to run") }, {.name = NULL} }; -- 2.6.4

2 2

[libvirt] [PATCH] wireshark: Install into DESTDIR
by Michal Privoznik 13 Jan '16

13 Jan '16

Like everything we install, it should be prefixed with DESTDIR. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- m4/virt-wireshark.m4 | 8 ++++---- tools/Makefile.am | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 199317e..ac2e44c 100644 --- a/m4/virt-wireshark.m4 +++ b/m4/virt-wireshark.m4 @@ -28,20 +28,20 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ dnl Check for system location of wireshark plugins if test "x$with_wireshark_dissector" != "xno" ; then if test "x$with_ws_plugindir" = "xcheck" ; then - ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)" + plugindir="$($PKG_CONFIG --variable plugindir wireshark)" if test "x$ws_plugindir" = "x" ; then dnl On some systems the plugindir variable may not be stored within pkg config. dnl Fall back to older style of constructing the plugin dir path. - ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" + plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" fi elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then AC_MSG_ERROR([ws-plugindir must be used only with valid path]) else - ws_plugindir=$with_ws_plugindir + plugindir=$with_ws_plugindir fi fi - AC_SUBST([ws_plugindir]) + AC_SUBST([plugindir]) ]) AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[ diff --git a/tools/Makefile.am b/tools/Makefile.am index e5c186c..d38d3cb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -381,6 +381,7 @@ EXTRA_DIST += \ if WITH_WIRESHARK_DISSECTOR +ws_plugindir = $(DESTDIR)$(plugindir) ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS = \ -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) -- 2.4.10

3 3

[libvirt] [PATCH] build: fix distdir with wireshark disabled
by Cole Robinson 13 Jan '16

13 Jan '16

Even though the Makefile has WITH_WIRESHARK guards, the _SOURCES variables are still processed when adding bits to the dist archive. plugin.c is a generated file that is only built when wireshark is enabled and it shouldn't be distributed, so use 'nodist' --- tools/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d38d3cb..5bf6a3e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -386,10 +386,10 @@ ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS = \ -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module +nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c wireshark_src_libvirt_la_SOURCES = \ wireshark/src/packet-libvirt.h \ - wireshark/src/packet-libvirt.c \ - wireshark/src/plugin.c + wireshark/src/packet-libvirt.c wireshark/src/packet-libvirt.c: wireshark/src/packet-libvirt.h \ wireshark/src/libvirt/protocol.h -- 2.5.0

3 3

[libvirt] [PATCHv3 0/3] 'autodeflate' attribute for mememory balloon
by Dmitry Andreev 13 Jan '16

13 Jan '16

This patch-set adds support for the new feature 'deflate-on-oom' that has been added to the QEMU virtio memory balloon a month ago. This feature lets a guest OS deflate balloon on OOM. With 'deflate-on-oom' enabled virtio balloon will release it's memory if possible right before an OOM termination of processes. QEMU commit with the complete feature description: http://git.qemu.org/?p=qemu.git;a=commit;h=e3816255bf4b6377bb405331e2ee0dc1… v3 * pull head & merge * reword commit message [1/3] [2/3] * docs: s/OOM-/Out of Memory / [1/3] * merge and fix qemu 2.6.0 caps test [2/3] * s/> 0/ != VIR_TRISTATE_SWITCH_ABSENT/ [3/3] Dmitry Andreev (3): conf: introduce 'autodeflate' attribute for memballoon device qemu: add capability check for memballoon 'deflate-on-oom' feature qemu: add support of optional 'autodeflate' attribute docs/formatdomain.html.in | 10 ++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 23 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 11 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 11 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 68 ++++++++- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 68 ++++++++- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 68 ++++++++- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 66 ++++++++- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 66 ++++++++- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 66 ++++++++- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 78 +++++++++- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 146 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 161 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 161 ++++++++++++++++++++- .../qemuxml2argv-balloon-ccw-deflate.args | 20 +++ .../qemuxml2argv-balloon-ccw-deflate.xml | 21 +++ .../qemuxml2argv-balloon-device-deflate-off.args | 23 +++ .../qemuxml2argv-balloon-device-deflate-off.xml | 25 ++++ .../qemuxml2argv-balloon-device-deflate.args | 23 +++ .../qemuxml2argv-balloon-device-deflate.xml | 25 ++++ .../qemuxml2argv-balloon-mmio-deflate.args | 25 ++++ .../qemuxml2argv-balloon-mmio-deflate.xml | 30 ++++ tests/qemuxml2argvtest.c | 9 ++ 29 files changed, 1145 insertions(+), 70 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml -- 1.8.3.1

3 6

[libvirt] [PATCH] qemuProcessCleanupChardevDevice: Don't unlink NULL paths
by Michal Privoznik 13 Jan '16

13 Jan '16

So, you try to start a domain, but before we even get to the part where chardev part of qemu command line is generated (and possibly missing path to unix sockets is made up) an error occurs which results in calling qemuProcessStop. This will then try to clean up the mess and possibly ends up calling unlink(NULL). ==8085== Thread 3: ==8085== Syscall param unlink(pathname) points to unaddressable byte(s) ==8085== at 0xA85EA57: unlink (in /lib64/libc-2.21.so) ==8085== by 0x213D3C24: qemuProcessCleanupChardevDevice (qemu_process.c:2866) ==8085== by 0x558D6B1: virDomainChrDefForeach (domain_conf.c:22924) ==8085== by 0x213DA9AE: qemuProcessStop (qemu_process.c:5326) ==8085== by 0x213DA2F2: qemuProcessStart (qemu_process.c:5190) ==8085== by 0x2142957F: qemuDomainObjStart (qemu_driver.c:7396) ==8085== by 0x214297DB: qemuDomainCreateWithFlags (qemu_driver.c:7450) ==8085== by 0x21429842: qemuDomainCreate (qemu_driver.c:7468) ==8085== by 0x5611B95: virDomainCreate (libvirt-domain.c:6753) ==8085== by 0x125D9A: remoteDispatchDomainCreate (remote_dispatch.h:3613) ==8085== by 0x125CB7: remoteDispatchDomainCreateHelper (remote_dispatch.h:3589) ==8085== by 0x568BF41: virNetServerProgramDispatchCall (virnetserverprogram.c:437) ==8085== Address 0x0 is not stack'd, malloc'd or (recently) free'd ==8085== Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3d9e0e5..f083f3f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2862,7 +2862,8 @@ qemuProcessCleanupChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { if (dev->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && - dev->source.data.nix.listen) + dev->source.data.nix.listen && + dev->source.data.nix.path) unlink(dev->source.data.nix.path); return 0; -- 2.4.10

2 1