- Devel - libvirt List Archives

[libvirt] Hot plug multi function PCI devices
by Ziviani . 08 Jan '16

08 Jan '16

Hello list! I'm new here and interested in hot-plug multi-function PCI devices. Basically I'd like to know why Libvirt does not support it. I've been through the archives and basically found this thread: https://www.redhat.com/archives/libvir-list/2011-May/msg00457.html But Qemu seems to handle it accordingly: virsh qemu-monitor-command --hmp fedora-23 'device_add vfio-pci,host=00:16.0,addr=08.0' virsh qemu-monitor-command --hmp fedora-23 'device_add vfio-pci,host=00:16.3,addr=08.3' GUEST: # lspci (snip) 00:08.0 Communication controller: Intel Corporation 8 Series HECI #0 (rev 04) 00:08.3 Serial controller: Intel Corporation 8 Series HECI KT (rev 04) However, using Libvirt: % virsh attach-device fedora-23 pci_0000_00_16_0.xml --live Device attached successfully % virsh attach-device fedora-23 pci_0000_00_16_3.xml --live error: Failed to attach device from pci_0000_00_16_3.xml error: internal error: Only PCI device addresses with function=0 are supported I made some changes on domain_addr.c[1] for testing and it worked. [1]https://gist.github.com/jrziviani/1da184c7fd0b413e0426 % virsh attach-device fedora-23 pci_0000_00_16_3.xml --live Device attached successfully GUEST: # lspci (snip) 00:08.0 Communication controller: Intel Corporation 8 Series HECI #0 (rev 04) 00:08.3 Serial controller: Intel Corporation 8 Series HECI KT (rev 04) So there is more to it that I'm not aware? Thank you!

2 6

[libvirt] [PATCH v2] tests: Add newlines with VIR_TEST_REGENERATE_OUTPUT
by Cole Robinson 08 Jan '16

08 Jan '16

Since test files are formatted predictably nowadays, we can make VIR_TEST_REGENERATE_OUTPUT handle most cases for us with a simple replacement. test-wrap-argv.pl is still canon, but this bit makes it easier to confirm test output changes during active development. --- v2: Rebase on .git master tests/testutils.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 6645d61..0091fcd 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -469,10 +469,19 @@ virtTestDifferenceFullInternal(FILE *stream, actualStart = actual; actualEnd = actual + (strlen(actual)-1); - if (regenerate && virTestGetRegenerate() > 0) { + if (regenerate && (virTestGetRegenerate() > 0) && expectName && actual) { + char *regencontent; + + /* Try to properly indent qemu argv files */ + if (!(regencontent = virStringReplace(actual, " -", " \\\n-"))) + return -1; + if (expectName && actual && - virFileWriteStr(expectName, actual, 0666) < 0) + virFileWriteStr(expectName, regencontent, 0666) < 0) { + VIR_FREE(regencontent); return -1; + } + VIR_FREE(regencontent); } if (!virTestGetDebug()) -- 2.5.0

1 0

[libvirt] [PATCH] util: add missing newline
by Laine Stump 08 Jan '16

08 Jan '16

Somehow I managed to backspace over the newline between the closing brace and goto cleanup; in commit 36e244f3. --- Pushed under trivial rule. src/util/virnetdevvportprofile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 61676b4..4140cdc 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 Red Hat, Inc. + * Copyright (C) 2009-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 @@ -592,7 +592,8 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, tb_port[IFLA_PORT_VF] ? *(uint32_t *)RTA_DATA(tb_port[IFLA_PORT_VF]) : -1, uuidstr); - } goto cleanup; + } + goto cleanup; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 2.5.0

1 0

[libvirt] [PATCH] Fix USB model defaults for ppc64
by Martin Kletzander 08 Jan '16

08 Jan '16

The condition was checking for UHCI (and OHCI for ppc64) availability so that it can specify the proper device instead of legacy usb. However, for ppc64, we don't need to check both OHCI and UHCI, but only OHCI as that is the legacy default. The condition is so big that it was just a matter of time when someone will make a mistake there, so let's use more lines so that it is visible what the condition checks for. This fixes usage of -device instead of -usb for ppc64 that supports pci-usb-ohci and does not support piix3-usb-uhci. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 34 +++++++++++++++------- .../qemuxml2argv-ppc64-usb-controller-legacy.args | 20 +++++++++++++ .../qemuxml2argv-ppc64-usb-controller-legacy.xml | 1 + .../qemuxml2argv-ppc64-usb-controller.args | 20 +++++++++++++ .../qemuxml2argv-ppc64-usb-controller.xml | 28 ++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 6 files changed, 95 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1f0593526b55..3f464a5fc21d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10049,18 +10049,30 @@ qemuBuildCommandLine(virConnectPtr conn, if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == -1 && - !qemuDomainMachineIsQ35(def) && - (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || - (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && - ARCH_IS_PPC64(def->os.arch)))) { - if (usblegacy) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiple legacy USB controllers are " - "not supported")); - goto error; + !qemuDomainMachineIsQ35(def)) { + bool need_legacy = false; + + /* We're not using legacy usb controller for q35 */ + if (ARCH_IS_PPC64(def->os.arch)) { + /* For ppc64 the legacy was OHCI */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) + need_legacy = true; + } else { + /* For anything else, we used * PIIX3_USB_UHCI */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) + need_legacy = true; + } + + if (need_legacy) { + if (usblegacy) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Multiple legacy USB controllers are " + "not supported")); + goto error; + } + usblegacy = true; + continue; } - usblegacy = true; - continue; } virCommandAddArg(cmd, "-device"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args new file mode 100644 index 000000000000..3dee41e86481 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args @@ -0,0 +1,20 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-system-ppc64 \ +-name QEMUGuest1 \ +-S \ +-M pseries \ +-m 256 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml new file mode 120000 index 000000000000..831d9d4f1c1b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml @@ -0,0 +1 @@ +qemuxml2argv-ppc64-usb-controller.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args new file mode 100644 index 000000000000..3dee41e86481 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args @@ -0,0 +1,20 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-system-ppc64 \ +-name QEMUGuest1 \ +-S \ +-M pseries \ +-m 256 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.xml b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.xml new file mode 100644 index 000000000000..ce180ee34989 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/qemu-system-ppc64</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 63480ce8af19..1476def2f57d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1764,6 +1764,9 @@ mymain(void) QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET); DO_TEST("virtio-input-passthrough", QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_INPUT_HOST); + DO_TEST("ppc64-usb-controller", QEMU_CAPS_PCI_OHCI); + DO_TEST("ppc64-usb-controller-legacy", QEMU_CAPS_PIIX3_USB_UHCI); + qemuTestDriverFree(&driver); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 2.7.0

2 3

[libvirt] [PATCH] tests: qemuxml2argv: Add tests for USB controller on q35
by Andrea Bolognani 08 Jan '16

08 Jan '16

--- .../qemuxml2argv-usb-controller-default-q35.args | 21 +++++++++++++++++ .../qemuxml2argv-usb-controller-default-q35.xml | 27 ++++++++++++++++++++++ ...argv-usb-controller-default-unavailable-q35.xml | 27 ++++++++++++++++++++++ .../qemuxml2argv-usb-controller-explicit-q35.args | 21 +++++++++++++++++ .../qemuxml2argv-usb-controller-explicit-q35.xml | 27 ++++++++++++++++++++++ ...rgv-usb-controller-explicit-unavailable-q35.xml | 27 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 17 +++++++++++++- 7 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args new file mode 100644 index 0000000..a746d37 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args @@ -0,0 +1,21 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-name q35-test \ +-S \ +-M q35 \ +-m 2048 \ +-smp 1 \ +-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ +-device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml new file mode 100644 index 0000000..26eecef --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='2' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='56'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml new file mode 100644 index 0000000..26eecef --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='2' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='56'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args new file mode 100644 index 0000000..6fd058c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args @@ -0,0 +1,21 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-name q35-test \ +-S \ +-M q35 \ +-m 2048 \ +-smp 1 \ +-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ +-device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml new file mode 100644 index 0000000..f3b34ee --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='2' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='56'/> + </controller> + <controller type='usb' index='0' model='nec-xhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml new file mode 100644 index 0000000..f3b34ee --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='2' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='56'/> + </controller> + <controller type='usb' index='0' model='nec-xhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 63480ce..b023522 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1181,7 +1181,22 @@ mymain(void) QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-none-usbtablet", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); - + DO_TEST("usb-controller-default-q35", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-default-unavailable-q35", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-controller-explicit-q35", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); -- 2.5.0

2 2

[libvirt] [PATCH 0/5] Misc migration cleanups
by Jiri Denemark 08 Jan '16

08 Jan '16

Jiri Denemark (5): qemu: Reorder migration status enum qemu: Rename qemuMonitorMigrationStatus struct qemu: Create a proper type for migration status enum qemu: Report more migration statistics qemu: Refactor qemuMigrationFinish include/libvirt/libvirt-domain.h | 19 ++ src/qemu/qemu_domain.c | 92 +++++----- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 368 ++++++++++++++++++++------------------- src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 20 ++- src/qemu/qemu_monitor_json.c | 96 +++++----- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_monitor_text.c | 40 ++--- src/qemu/qemu_monitor_text.h | 4 +- src/qemu/qemu_process.c | 2 +- tests/qemumonitorjsontest.c | 22 +-- tools/virsh-domain.c | 16 ++ 14 files changed, 388 insertions(+), 313 deletions(-) -- 2.7.0

2 11

[libvirt] [PATCH 0/4] Adjustment to recent cgroup/cpuset changes
by John Ferlan 08 Jan '16

08 Jan '16

The problem being resolved by this series was seen as a failure in the virt-test 'memtune' test which attempts to look at the on disk change for the cgroup by using the 'memory' controller entry in /proc/$pid/cgroup. For reasons still not quite 100% crystal clear, without doing the revert in patch#3 of this series, the /proc/$pid/cgroup file gets updated with the controller path. On the somewhat older f20 test system, this resulted in an adjustment to other controllers (memory, devices, and blkio). On a different test environment (f23), the file wasn't erroneously updated. Although systemd may ultimately be at fault - it just wasn't obvious what the failure was - so reverting the patch and making the one change (in patch #4) that appeared to at least follow the spirit of the reverted patch with respect to using virCgroupAddTask for the qemuSetupCgroupForEmulator similar to how qemuSetupCgroupForVcpu does it for the various vpcu threads. 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

1 4

[libvirt] [PATCH 00/10] [rebase] various test fixes and input devices handling
by Pavel Hrdina 08 Jan '16

08 Jan '16

This is just a rebase to current HEAD. Pavel Hrdina (10): xen: move virDomainDefPostParse to xenParseSxpr tests: introduce VIR_TEST_REGENERATE_OUTPUT flag tests.testutils: use VIR_TEST_REGENERATE_OUTPUT for virTestDifferenceFull tests.testutils: use virTestDifferenceFull in virtTestCompareToFile tests: use virtTestDifferenceFull in tests where we have output file tests: skip regeneration for problematic test tests: regenerate all outputs using VIR_TEST_REGENERATE_OUTPUT flag tests.nwfilterebiptablestest: swap actual and expected device: cleanup input device code tests: update test XML files to follow input changes src/Makefile.am | 4 +- src/conf/domain_conf.c | 77 +----------- src/libxl/libxl_domain.c | 5 + src/qemu/qemu_domain.c | 22 ++++ src/xen/xen_driver.c | 5 + src/xen/xend_internal.c | 7 +- src/xenapi/xenapi_driver.c | 5 + src/xenconfig/xen_common.c | 22 ++++ src/xenconfig/xen_common.h | 2 + src/xenconfig/xen_sxpr.c | 21 ++-- src/xenconfig/xen_sxpr.h | 6 +- .../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/nwfilterebiptablestest.c | 14 +-- tests/qemuargv2xmltest.c | 18 ++- 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 | 6 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 6 +- .../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 | 6 +- 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 | 6 +- .../qemuxml2argv-clock-timer-hyperv-rtc.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 6 +- .../qemuxml2argv-console-compat.xml | 6 +- .../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 | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 6 +- .../qemuxml2argv-disk-copy_on_read.xml | 2 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 7 +- .../qemuxml2argv-disk-drive-boot-disk.xml | 7 +- .../qemuxml2argv-disk-drive-cache-directsync.xml | 2 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 6 +- .../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-graphics-vnc-policy.xml | 4 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 4 +- .../qemuxml2argv-graphics-vnc-tls.xml | 4 +- .../qemuxml2argv-graphics-vnc-websocket.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 4 +- .../qemuxml2argv-hostdev-pci-address.xml | 6 +- .../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 | 6 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 6 +- .../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 | 6 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 2 + .../qemuxml2argv-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuxml2argv-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuxml2argv-machine-core-off.xml | 6 +- .../qemuxml2argv-machine-core-on.xml | 6 +- .../qemuxml2argv-machine-deakeywrap-off-argv.xml | 4 +- .../qemuxml2argv-machine-deakeywrap-on-argv.xml | 4 +- .../qemuxml2argv-machine-keywrap-none-argv.xml | 4 +- .../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 | 6 +- .../qemuxml2argv-misc-disable-suspends.xml | 6 +- .../qemuxml2argv-misc-enable-s4.xml | 6 +- .../qemuxml2argv-misc-no-reboot.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 + .../qemuxml2argv-net-eth-ifname.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 6 +- .../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 | 6 +- .../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 | 6 +- 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 + .../qemuxml2argvdata/qemuxml2argv-pseries-disk.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 | 6 +- .../qemuxml2argv-reboot-timeout-enabled.xml | 6 +- 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 | 6 +- .../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 | 6 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 6 +- 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 | 6 +- .../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 | 8 +- 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/testutils.c | 134 ++++++++++++++++++--- tests/testutils.h | 8 ++ tests/vboxsnapshotxmltest.c | 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 + 322 files changed, 915 insertions(+), 220 deletions(-) -- 2.7.0

5 22

[libvirt] [PATCH] qemu: align the cur_balloon too if not explicitly specified by the user
by Shivaprasad G Bhat 08 Jan '16

08 Jan '16

As of now, the cur_ballon is set to actual memory if not specified by the user. When the user specified memory is not aligned the cur_balloon alone ends up unaligned. For qemu in function qemuDomainAttachMemory(), the cur_balloon wouldn't add up to the actual memory as the cur_ballon was not aligned. So, there is need for explicit setmem post attach-device for such guests. The decision as to whether to align the cur_balloon memory or not is not possible if we set it to actual memory by default in post-parse. Move the default cur_balloon assignment to their respective drivers during domain start wherever possible. For qemu align the cur_balloon too iow assign the aligned actual memory when not specified by the user. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 3 +-- src/libxl/libxl_conf.c | 2 ++ src/lxc/lxc_process.c | 3 +++ src/openvz/openvz_driver.c | 13 +++++++------ src/phyp/phyp_driver.c | 10 +++------- src/qemu/qemu_domain.c | 3 +++ src/uml/uml_conf.c | 3 +++ src/vbox/vbox_common.c | 3 +++ src/vmx/vmx.c | 3 +++ src/vz/vz_sdk.c | 3 +++ src/xenconfig/xen_common.c | 3 +++ src/xenconfig/xen_sxpr.c | 4 ++++ 12 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2f5c0ed..68338f4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3527,8 +3527,7 @@ virDomainDefPostParseMemory(virDomainDefPtr def, return -1; } - if (def->mem.cur_balloon > virDomainDefGetMemoryActual(def) || - def->mem.cur_balloon == 0) + if (def->mem.cur_balloon > virDomainDefGetMemoryActual(def)) def->mem.cur_balloon = virDomainDefGetMemoryActual(def); if ((def->mem.max_memory || def->mem.memory_slots) && diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4eed5ca..6b6e764 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -665,6 +665,8 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } b_info->sched_params.weight = 1000; b_info->max_memkb = virDomainDefGetMemoryInitial(def); + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryInitial(def); b_info->target_memkb = def->mem.cur_balloon; if (hvm) { char bootorder[VIR_DOMAIN_BOOT_LAST + 1]; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 57e3880..201ee61 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1257,6 +1257,9 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->resource = res; } + if (!vm->def->mem.cur_balloon) + vm->def->mem.cur_balloon = virDomainDefGetMemoryActual(vm->def); + if (virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name) < 0) goto cleanup; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index b8c0f50..8a56d94 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1043,12 +1043,13 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla } } - if (vm->def->mem.cur_balloon > 0) { - if (openvzDomainSetMemoryInternal(vm, vm->def->mem.cur_balloon) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not set memory size")); - goto cleanup; - } + if (!vm->def->mem.cur_balloon) + vm->def->mem.cur_balloon = virDomainDefGetMemoryActual(vm->def); + + if (openvzDomainSetMemoryInternal(vm, vm->def->mem.cur_balloon) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not set memory size")); + goto cleanup; } dom = virGetDomain(conn, vm->def->name, vm->def->uuid); diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 14264c0..1fc7b34 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3491,13 +3491,6 @@ phypBuildLpar(virConnectPtr conn, virDomainDefPtr def) int exit_status = 0; virBuffer buf = VIR_BUFFER_INITIALIZER; - if (!def->mem.cur_balloon) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Field <currentMemory> on the domain XML file is " - "missing or has invalid value")); - goto cleanup; - } - if (!virDomainDefGetMemoryInitial(def)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Field <memory> on the domain XML file is missing or " @@ -3505,6 +3498,9 @@ phypBuildLpar(virConnectPtr conn, virDomainDefPtr def) goto cleanup; } + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryActual(def); + if (def->ndisks < 1) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Domain XML must contain at least one <disk> element.")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 40e1f18..9d92d99 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3567,6 +3567,9 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def) } } + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryActual(def); + return 0; } diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index afc0375..c53bc65 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -399,6 +399,9 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn, virCommandAddEnvPassCommon(cmd); + if (!vm->def->mem.cur_balloon) + vm->def->mem.cur_balloon = virDomainDefGetMemoryActual(vm->def); + //virCommandAddArgPair(cmd, "con0", "fd:0,fd:1"); virCommandAddArgFormat(cmd, "mem=%lluK", vm->def->mem.cur_balloon); virCommandAddArgPair(cmd, "umid", vm->def->name); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9369367..38bf35e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1886,6 +1886,9 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags goto cleanup; } + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryActual(def); + rc = gVBoxAPI.UIMachine.SetMemorySize(machine, VIR_DIV_UP(def->mem.cur_balloon, 1024)); if (NS_FAILED(rc)) { diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 7c3c10a..8f4d66a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3157,6 +3157,9 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe virBufferAsprintf(&buffer, "memsize = \"%llu\"\n", max_balloon / 1024); /* Scale from kilobytes to megabytes */ + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryActual(def); + /* def:mem.cur_balloon -> vmx:sched.mem.max */ if (def->mem.cur_balloon < max_balloon) { virBufferAsprintf(&buffer, "sched.mem.max = \"%llu\"\n", diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 1fced3f..131f6bb 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3475,6 +3475,9 @@ prlsdkDoApplyConfig(virConnectPtr conn, bool needBoot = true; char *mask = NULL; + if (!def->mem.cur_ballon) + def->mem.cur_ballon = virDomainDefGetMemoryActual(def); + if (prlsdkCheckUnsupportedParams(sdkdom, def) < 0) return -1; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 0890c73..ba6dffa 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1306,6 +1306,9 @@ xenFormatMem(virConfPtr conf, virDomainDefPtr def) VIR_DIV_UP(virDomainDefGetMemoryActual(def), 1024)) < 0) return -1; + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryActual(def); + if (xenConfigSetInt(conf, "memory", VIR_DIV_UP(def->mem.cur_balloon, 1024)) < 0) return -1; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 7fc9c9d..63b79a0 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2219,6 +2219,10 @@ xenFormatSxpr(virConnectPtr conn, virBufferAddLit(&buf, "(vm "); virBufferEscapeSexpr(&buf, "(name '%s')", def->name); + + if (!def->mem.cur_balloon) + def->mem.cur_balloon = virDomainDefGetMemoryActual(def); + virBufferAsprintf(&buf, "(memory %llu)(maxmem %llu)", VIR_DIV_UP(def->mem.cur_balloon, 1024), VIR_DIV_UP(virDomainDefGetMemoryActual(def), 1024));

2 1

[libvirt] [PATCH 0/2] Xen: Support vif outging bandwidth QoS
by Jim Fehlig 08 Jan '16

08 Jan '16

Happy Holidays! :-) This small series adds support for specifying vif outgoing rate limits in Xen. The first patch adds support for converting rate limits between xl/xm config and domXML, along with introducing a test for the conversion logic. The second patch adds outgoing rate limiting to the libxl driver. Jim Fehlig (2): xenconfig: support parsing and formatting vif bandwidth libxl: support vif outgoing bandwidth QoS src/libxl/libxl_conf.c | 39 ++++++++++++++++++ src/xenconfig/xen_common.c | 77 ++++++++++++++++++++++++++++++++++++ tests/xlconfigdata/test-vif-rate.cfg | 26 ++++++++++++ tests/xlconfigdata/test-vif-rate.xml | 57 ++++++++++++++++++++++++++ tests/xlconfigtest.c | 1 + 5 files changed, 200 insertions(+) create mode 100644 tests/xlconfigdata/test-vif-rate.cfg create mode 100644 tests/xlconfigdata/test-vif-rate.xml -- 2.1.4

2 7

[libvirt] [PATCH] Remove non-breaking space in comment
by Martin Kletzander 08 Jan '16

08 Jan '16

It was added by mistake before the 'If' by commit 714080791778. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 73fc79dab56b..a539278058fa 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1340,7 +1340,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, * If the address is generated by us (starts with our * channel dir), we should not keep it in the persistent * XML. If libvirt is the one who generated it, users - * shouldn't care about that. If they do, they are + * shouldn't care about that. If they do, they are * supposed to set it themselves. */ VIR_FREE(dev->data.chr->source.data.nix.path); -- 2.7.0

1 0

[libvirt] Libvirt 1.3.0 compilation failure on OSX 10.9.5
by Justin Clift 08 Jan '16

08 Jan '16

Hiyas, Just went to update the MacOS X Homebrew port/formula for Libvirt 1.3.0. It's failing during compilation with: *********************************************************************************** Last 15 lines from /Users/jc/Library/Logs/Homebrew/libvirt/02.make: CCLD libvirt_driver_vbox.la CCLD libvirt_driver_storage.la Undefined symbols for architecture x86_64: "_xdr_uint64_t", referenced from: _xdr_virLogManagerProtocolLogFilePosition in virtlogd-log_protocol.o _xdr_virLogManagerProtocolDomainOpenLogFileRet in virtlogd-log_protocol.o _xdr_virLogManagerProtocolDomainGetLogFilePositionRet in virtlogd-log_protocol.o _xdr_virLogManagerProtocolDomainReadLogFileArgs in virtlogd-log_protocol.o ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) make[3]: *** [virtlogd] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [all] Error 2 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 *********************************************************************************** Is this a known thing, or should I grab the rest of the failure logging for someone (not me) to look at? :) + Justin

3 6

[libvirt] [PATCH] qemu: Fix NBD migration with default listenAddress
by Jiri Denemark 08 Jan '16

08 Jan '16

My commit 674afcb09e3d33500cfbbcf870ebf92cb99ecfa3 moved computing the default listen address from qemuMigrationPrepareAny to qemuMigrationPrepareIncoming. However, I didn't notice listenAddress was later passed to qemuMigrationStartNBDServer. Thus, it would be called with the original value of listenAddress (NULL). Let's add the updated listen address to qemuProcessIncomingDef and use it when starting NBD servers. Reported-by: Michael Chapman <mike(a)very.puzzling.org> Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 5 +++-- src/qemu/qemu_process.c | 7 ++++++- src/qemu/qemu_process.h | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6be11b4..cb8c75d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3365,7 +3365,8 @@ qemuMigrationPrepareIncoming(virDomainObjPtr vm, goto cleanup; } - inc = qemuProcessIncomingDefNew(priv->qemuCaps, migrateFrom, fd, NULL); + inc = qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress, + migrateFrom, fd, NULL); cleanup: VIR_FREE(migrateFrom); @@ -3586,7 +3587,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (mig->nbd && flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) { - if (qemuMigrationStartNBDServer(driver, vm, listenAddress, + if (qemuMigrationStartNBDServer(driver, vm, incoming->address, nmigrate_disks, migrate_disks) < 0) { goto stopjob; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f274068..819ad05 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4124,6 +4124,7 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDefPtr inc) if (!inc) return; + VIR_FREE(inc->address); VIR_FREE(inc->launchURI); VIR_FREE(inc->deferredURI); VIR_FREE(inc); @@ -4137,6 +4138,7 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDefPtr inc) */ qemuProcessIncomingDefPtr qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, + const char *listenAddress, const char *migrateFrom, int fd, const char *path) @@ -4149,6 +4151,9 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, if (VIR_ALLOC(inc) < 0) return NULL; + if (VIR_STRDUP(inc->address, listenAddress) < 0) + goto error; + inc->launchURI = qemuMigrationIncomingURI(migrateFrom, fd); if (!inc->launchURI) goto error; @@ -5137,7 +5142,7 @@ qemuProcessStart(virConnectPtr conn, goto cleanup; if (migrateFrom) { - incoming = qemuProcessIncomingDefNew(priv->qemuCaps, migrateFrom, + incoming = qemuProcessIncomingDefNew(priv->qemuCaps, NULL, migrateFrom, migrateFd, migratePath); if (!incoming) goto stop; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 85e3a06..c674111 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -47,6 +47,7 @@ int qemuProcessAssignPCIAddresses(virDomainDefPtr def); typedef struct _qemuProcessIncomingDef qemuProcessIncomingDef; typedef qemuProcessIncomingDef *qemuProcessIncomingDefPtr; struct _qemuProcessIncomingDef { + char *address; /* address where QEMU is supposed to listen */ char *launchURI; /* used as a parameter for -incoming command line option */ char *deferredURI; /* used when calling migrate-incoming QMP command */ int fd; /* for fd:N URI */ @@ -54,6 +55,7 @@ struct _qemuProcessIncomingDef { }; qemuProcessIncomingDefPtr qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, + const char *listenAddress, const char *migrateFrom, int fd, const char *path); -- 2.7.0

2 1

[libvirt] [PATCH 0/4] virsh: Some events cleanups and improvements
by Jiri Denemark 08 Jan '16

08 Jan '16

Jiri Denemark (4): virsh: Refactor event printing virsh: Add timestamps to events virsh: Pass ctl to virshCatchDisconnect virsh: Interrupt *event --loop on disconnect tools/virsh-domain.c | 310 +++++++++++++++++++++++++-------------------------- tools/virsh.c | 5 +- 2 files changed, 156 insertions(+), 159 deletions(-) -- 2.6.4

2 12

[libvirt] [PATCH] pci: Log debug messages when manipulating the inactive list
by Andrea Bolognani 08 Jan '16

08 Jan '16

Most of the changes to the list of active and inactive PCI devices happen in virHostdev, where they are properly logged. virPCIDeviceDetach() and virPCIDeviceReattach(), however, change the inactive list as well, so they should be logging similar messages. --- src/util/virpci.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 5ebd408..505c1f3 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1370,9 +1370,10 @@ virPCIDeviceDetach(virPCIDevicePtr dev, /* Add *a copy of* the dev into list inactiveDevs, if * it's not already there. */ - if (inactiveDevs && !virPCIDeviceListFind(inactiveDevs, dev) && - virPCIDeviceListAddCopy(inactiveDevs, dev) < 0) { - return -1; + if (inactiveDevs && !virPCIDeviceListFind(inactiveDevs, dev)) { + VIR_DEBUG("Adding PCI device %s to inactive list", dev->name); + if (virPCIDeviceListAddCopy(inactiveDevs, dev) < 0) + return -1; } return 0; @@ -1393,8 +1394,10 @@ virPCIDeviceReattach(virPCIDevicePtr dev, return -1; /* Steal the dev from list inactiveDevs */ - if (inactiveDevs) + if (inactiveDevs) { + VIR_DEBUG("Removing PCI device %s from inactive list", dev->name); virPCIDeviceListDel(inactiveDevs, dev); + } return 0; } -- 2.5.0

2 2

[libvirt] [PATCH] qemu: fix default migration_address for NBD server
by Michael Chapman 07 Jan '16

07 Jan '16

If no migration_address is configured, QEMU will listen on 0.0.0.0 or [::]. Commit 674afcb09e3d33500cfbbcf870ebf92cb99ecfa3 moved the handling of this default value into a new qemuMigrationPrepareIncoming function, however the address is also needed when starting the NBD server from within qemuMigrationPrepareAny. Without this commit, the nbd-server-start command fails if no explicit migration_address is configured since libvirt passes a null value in the listen address: { "execute": "nbd-server-start", "arguments": { "addr": { "type": "inet", "data": { "host": null, "port": "49153" } } }, "id": "libvirt-14" } The migration address only applies to direct migration. Unfortunately we can't move this logic as far back as qemuMigrationPrepareDirect since QEMU's IPv6 support is only known after it has been launched. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 79 +++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4519aef..3f83b57 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3307,54 +3307,14 @@ qemuMigrationPrepareIncoming(virDomainObjPtr vm, if (VIR_STRDUP(migrateFrom, "stdio") < 0) goto cleanup; } else { - bool encloseAddress = false; - bool hostIPv6Capable = false; - bool qemuIPv6Capable = false; - struct addrinfo *info = NULL; - struct addrinfo hints = { .ai_flags = AI_ADDRCONFIG, - .ai_socktype = SOCK_STREAM }; const char *incFormat; - if (getaddrinfo("::", NULL, &hints, &info) == 0) { - freeaddrinfo(info); - hostIPv6Capable = true; - } - qemuIPv6Capable = virQEMUCapsGet(priv->qemuCaps, - QEMU_CAPS_IPV6_MIGRATION); - - if (listenAddress) { - if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) { - if (!qemuIPv6Capable) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("qemu isn't capable of IPv6")); - goto cleanup; - } - if (!hostIPv6Capable) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("host isn't capable of IPv6")); - goto cleanup; - } - /* IPv6 address must be escaped in brackets on the cmd line */ - encloseAddress = true; - } else { - /* listenAddress is a hostname or IPv4 */ - } - } else if (qemuIPv6Capable && hostIPv6Capable) { - /* Listen on :: instead of 0.0.0.0 if QEMU understands it - * and there is at least one IPv6 address configured - */ - listenAddress = "::"; - encloseAddress = true; - } else { - listenAddress = "0.0.0.0"; - } - /* QEMU will be started with * -incoming protocol:[<IPv6 addr>]:port, * -incoming protocol:<IPv4 addr>:port, or * -incoming protocol:<hostname>:port */ - if (encloseAddress) + if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) incFormat = "%s:[%s]:%d"; else incFormat = "%s:%s:%d"; @@ -3540,6 +3500,43 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, goto stopjob; stopProcess = true; + if (!tunnel) { + bool hostIPv6Capable = false; + bool qemuIPv6Capable = false; + struct addrinfo *info = NULL; + struct addrinfo hints = { .ai_flags = AI_ADDRCONFIG, + .ai_socktype = SOCK_STREAM }; + + if (getaddrinfo("::", NULL, &hints, &info) == 0) { + freeaddrinfo(info); + hostIPv6Capable = true; + } + qemuIPv6Capable = virQEMUCapsGet(priv->qemuCaps, + QEMU_CAPS_IPV6_MIGRATION); + + if (listenAddress) { + if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) { + if (!qemuIPv6Capable) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("qemu isn't capable of IPv6")); + goto stopjob; + } + if (!hostIPv6Capable) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("host isn't capable of IPv6")); + goto stopjob; + } + } + } else if (qemuIPv6Capable && hostIPv6Capable) { + /* Listen on :: instead of 0.0.0.0 if QEMU understands it + * and there is at least one IPv6 address configured + */ + listenAddress = "::"; + } else { + listenAddress = "0.0.0.0"; + } + } + if (!(incoming = qemuMigrationPrepareIncoming(vm, tunnel, protocol, listenAddress, port, dataFD[0]))) -- 2.4.3

2 1

[libvirt] [PATCH] nestedhvm for libxl
by Alvin Starr 07 Jan '16

07 Jan '16

This patch adds a nestedhvm directive to the lxm features to allow libxl to create a nested HVM. It also has mask_svm_npt to allow the created HVM to have the svm/npt bits masked so that it cannot in turn run up an nested hvm. Alvin Starr (1): add nested HVM to libxl docs/schemas/domaincommon.rng | 10 ++++++++++ src/conf/domain_conf.c | 6 ++++++ src/conf/domain_conf.h | 2 ++ src/libxl/libxl_conf.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+) -- 2.4.3

3 7

[libvirt] [PATCH 0/2] Couple of logging memleaks
by Michal Privoznik 07 Jan '16

07 Jan '16

I've found them by pure chance and they were easy to fix. Michal Privoznik (2): virLogHostnameString: Don't leak hostname virLogVMessage: Don't leak rawinitmsg src/util/virlog.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.4.10

2 4

[libvirt] [PATCH v2 00/14] Use macros for more common virsh command options
by John Ferlan 07 Jan '16

07 Jan '16

v1: http://www.redhat.com/archives/libvir-list/2015-December/msg00731.html Changes over v1: 1. Insert patch 1 to convert already pushed VSH_POOL into VIRSH_POOL since that was the review comment from this patch series 2. Insert patch 2 to move the POOL_OPT_COMMON to virsh.h for later patch reuse. 3. Use VIRSH_* instead of VSH_* for patches 1-8 (now 3-10) 4. Add usage of common domain for virsh-domain-monitor.c and virsh-snapshot.c (patches 11-12) 5. Add common macros for "network" and "interface" (patches 13-14). NOTE: I figure to let this perculate for a bit as I'll assume there may be varying opinions on this... Also, the next couple of weeks heavy on people perhaps paying not paying close attention to the list. John Ferlan (14): virsh: Covert VSH_POOL_ macro to VIRSH_POOL_ virsh: Move VIRSH_POOL_OPT_COMMON to virsh.h virsh: Create macro for common "domain" option virsh: Create macro for common "persistent" option virsh: Create macro for common "config" option virsh: Create macro for common "live" option virsh: Create macro for common "current" option virsh: Create macro for common "file" option virsh: Create macros for common "pool" options virsh: Create macros for common "vol" options virsh: Have domain-monitor use common "domain" option virsh: have snapshot use common "domain" option virsh: Create macro for common "network" option virsh: Create macro for common "interface" option po/POTFILES.in | 1 + tools/virsh-domain-monitor.c | 77 +--- tools/virsh-domain.c | 911 +++++++++---------------------------------- tools/virsh-interface.c | 37 +- tools/virsh-network.c | 61 +-- tools/virsh-pool.c | 71 ++-- tools/virsh-snapshot.c | 60 +-- tools/virsh-volume.c | 148 ++----- tools/virsh.h | 17 + 9 files changed, 334 insertions(+), 1049 deletions(-) -- 2.5.0

3 17

[libvirt] [PATCH] Fix LSB requirements in service script and sync them
by Martin Kletzander 07 Jan '16

07 Jan '16

Commit b22344f3285187ee1768d6e031bc0ff20e32552d mistakenly reordered Default-* lines. Thanks to that I noticed that we are very inconsistent with our init scripts, so I took the liberty of synchronizing them, updating them and making them all look shiny and new. So apart from fixing the LSB requirements, I also fixed the ordering, specified runlevels and fix the link to the reference specification. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/libvirtd.init.in | 11 ++++------- src/locking/virtlockd.init.in | 12 ++++++++---- src/logging/virtlogd.init.in | 8 ++++---- tools/libvirt-guests.init.in | 9 ++++++--- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 22006c448cdf..164732905d4b 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -1,19 +1,16 @@ #!/bin/sh # the following is the LSB init header see -# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-ge… +# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-gen… # ### BEGIN INIT INFO # Provides: libvirtd +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 # Required-Start: $network messagebus virtlogd -# Should-Start: $named -# Should-Start: xend -# Should-Start: avahi-daemon -# Should-Start: virtlockd # Required-Stop: $network messagebus +# Should-Start: $named xend avahi-daemon virtlockd # Should-Stop: $named -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 # Short-Description: daemon for libvirt virtualization API # Description: This is a daemon for managing guest instances # and libvirt virtual networks diff --git a/src/locking/virtlockd.init.in b/src/locking/virtlockd.init.in index 596bb6241485..0bf868ca7ff1 100644 --- a/src/locking/virtlockd.init.in +++ b/src/locking/virtlockd.init.in @@ -1,12 +1,16 @@ #!/bin/sh # the following is the LSB init header see -# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-ge… +# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-gen… # ### BEGIN INIT INFO # Provides: virtlockd -# Default-Start: -# Default-Stop: 0 1 2 3 4 5 6 +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Required-Start: +# Required-Stop: +# Should-Start: $network $remote_fs +# Should-Stop: $network $remote_fs # Short-Description: virtual machine lock manager # Description: This is a daemon for managing locks # on virtual machine disk images @@ -16,7 +20,7 @@ # # virtlockd: virtual machine lock manager # -# chkconfig: - 96 04 +# chkconfig: 345 96 04 # description: This is a daemon for managing locks \ # on virtual machine disk images # diff --git a/src/logging/virtlogd.init.in b/src/logging/virtlogd.init.in index 89b243dc0522..6aa88150469f 100644 --- a/src/logging/virtlogd.init.in +++ b/src/logging/virtlogd.init.in @@ -1,16 +1,16 @@ #!/bin/sh # the following is the LSB init header see -# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-ge… +# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-gen… # ### BEGIN INIT INFO # Provides: virtlogd -# Default-Start: 3 5 +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 # Required-Start: # Required-Stop: # Should-Start: $network $remote_fs # Should-Stop: $network $remote_fs -# Default-Stop: 0 1 2 4 6 # Short-Description: virtual machine log manager # Description: This is a daemon for managing logs # of virtual machine consoles @@ -20,7 +20,7 @@ # # virtlogd: virtual machine log manager # -# chkconfig: - 96 04 +# chkconfig: 345 96 04 # description: This is a daemon for managing logs \ # of virtual machine consoles # diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in index 5f9a60e81f05..7709df3b96a3 100644 --- a/tools/libvirt-guests.init.in +++ b/tools/libvirt-guests.init.in @@ -1,13 +1,16 @@ #!/bin/sh -# the following is the LSB init header +# the following is the LSB init header see +# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-gen… # ### BEGIN INIT INFO # Provides: libvirt-guests +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 # Required-Start: libvirtd # Required-Stop: libvirtd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Should-Start: +# Should-Stop: # Short-Description: suspend/resume libvirt guests on shutdown/boot # Description: This is a script for suspending active libvirt guests # on shutdown and resuming them on next boot -- 2.7.0

2 1

[libvirt] [PATCH] qemu: Don't bother user with libvirt-internal paths
by Martin Kletzander 07 Jan '16

07 Jan '16

If user defines a virtio channel with UNIX socket backend and doesn't care about the path for the socket (e.g. qemu-agent channel), we still generate it into the persistent XML. Moreover when then user renames the domain, due to its persistent socket path saved into the per-domain directory, it will not start. So let's forget about old generated paths and also stop putting them into the persistent definition. https://bugzilla.redhat.com/show_bug.cgi?id=1278068 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 12 ++++++++++++ src/qemu/qemu_domain.c | 21 +++++++++++---------- .../qemuxml2argv-channel-virtio-unix.args | 5 ++++- .../qemuxml2argv-channel-virtio-unix.xml | 4 ++++ 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 66ca11152ad8..c5127cfa04f9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10510,6 +10510,18 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } + if (channel->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && + !channel->source.data.nix.path) { + if (virAsprintf(&channel->source.data.nix.path, + "%s/domain-%s/%s", + cfg->channelTargetDir, def->name, + channel->target.name ? channel->target.name + : "unknown.sock") < 0) + goto error; + + channel->source.data.nix.listen = true; + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC) && channel->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { /* spicevmc was originally introduced via a -device diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bb8d47f9293d..73fc79dab56b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1329,20 +1329,21 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ARCH_IS_S390(def->os.arch)) dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - /* auto generate unix socket path */ + /* clear auto generated unix socket path */ if (dev->type == VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && - !dev->data.chr->source.data.nix.path) { - if (virAsprintf(&dev->data.chr->source.data.nix.path, - "%s/domain-%s/%s", - cfg->channelTargetDir, def->name, - dev->data.chr->target.name ? dev->data.chr->target.name - : "unknown.sock") < 0) - goto cleanup; - - dev->data.chr->source.data.nix.listen = true; + dev->data.chr->source.data.nix.path && + STRPREFIX(dev->data.chr->source.data.nix.path, cfg->channelTargetDir)) { + /* + * If the address is generated by us (starts with our + * channel dir), we should not keep it in the persistent + * XML. If libvirt is the one who generated it, users + * shouldn't care about that. If they do, they are + * supposed to set it themselves. + */ + VIR_FREE(dev->data.chr->source.data.nix.path); } /* forbid capabilities mode hostdev in this kind of hypervisor */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 94375b85df69..6a0b1f373603 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -33,4 +33,7 @@ nowait \ id=channel1 \ -chardev socket,id=charchannel2,path=/tmp/domain-QEMUGuest1/ble,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,\ -id=channel2,name=ble +id=channel2,name=ble \ +-chardev socket,id=charchannel3,path=/tmp/domain-QEMUGuest1/fdsa,server,nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,\ +id=channel3,name=fdsa diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml index 7fac943389bf..405dff8389bf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml @@ -32,6 +32,10 @@ <channel type='unix'> <target type='virtio' name='ble'/> </channel> + <channel type='unix'> + <source path='/tmp/domain-oldname/fdsa'/> + <target type='virtio' name='fdsa'/> + </channel> <memballoon model='none'/> </devices> </domain> -- 2.7.0

2 4

[libvirt] [PATCH] qemu: snapshot: Skip 'transaction' command when no disks are selected
by Peter Krempa 07 Jan '16

07 Jan '16

When doing a memory-only snapshot libvirt would still issue the 'transaction' command without any disk. Skip it if it isn't necessary. --- src/qemu/qemu_driver.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1161aa0..39c2c05 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14331,6 +14331,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; virJSONValuePtr actions = NULL; + bool do_transaction = false; int ret = 0; size_t i; bool persist = false; @@ -14379,9 +14380,11 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, reuse, asyncJob); if (ret < 0) break; + + do_transaction = true; } if (actions) { - if (ret == 0) { + if (ret == 0 && do_transaction) { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { ret = qemuMonitorTransaction(priv->mon, actions); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -14390,6 +14393,8 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, /* failed to enter monitor, clean stuff up and quit */ ret = -1; } + } else { + VIR_DEBUG("no disks to snapshot, skipping 'transaction' command"); } virJSONValueFree(actions); -- 2.6.2

2 2

[libvirt] [PATCH v2] fix LSB part of virtlogd runlevel script
by Olaf Hering 07 Jan '16

07 Jan '16

Currently pkg build of master branch fails: [ 300s] + /usr/lib/rpm/brp-boot-scripts [ 300s] E: File `virtlogd' is missing `Required-Start', please add even if empty! [ 300s] W: File `virtlogd' is missing `Required-Stop', please add even if empty! [ 300s] E: File `virtlogd' has empty `Default-Start', please specify default runlevel(s)! [ 300s] ERROR: found one or more broken init or boot scripts, please fix them. [ 300s] For more information about LSB headers please read the manual [ 300s] page of of insserv by executing the command `man 8 insserv'. [ 300s] If you don't understand this, mailto=werner(a)suse.de [ 300s] error: Bad exit status from /var/tmp/rpm-tmp.44965 (%install) Add the required tags, fix the existing tags. Use soft dependency "Should-Start" because virtlogd may work without network. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- v2: fix colon in Should-stop src/logging/virtlogd.init.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/logging/virtlogd.init.in b/src/logging/virtlogd.init.in index 1408236..dadc343 100644 --- a/src/logging/virtlogd.init.in +++ b/src/logging/virtlogd.init.in @@ -5,8 +5,12 @@ # ### BEGIN INIT INFO # Provides: virtlogd -# Default-Start: -# Default-Stop: 0 1 2 3 4 5 6 +# Default-Start: 3 5 +# Required-Start: +# Required-Stop: +# Should-Start: $network $remote_fs +# Should-Stop: $network $remote_fs +# Default-Stop: 0 1 2 4 6 # Short-Description: virtual machine log manager # Description: This is a daemon for managing logs # of virtual machine consoles

2 2

[libvirt] <interface type='hostdev'>vf configuration cleanup when VM is delete
by Moshe Levi 07 Jan '16

07 Jan '16

Hi, I have a setup with libvirt 1.3.0 and OpenStack trunk. Before launched the VM ip link command show the following VF mac/vlan configuration [1] When I launch a VM with <interface type='hostdev'> via openstack api (OpenStack direct port) I can see that the VF get the mac/vlan according to libvrit xml [2] and ip link command [3], but when I delete the VM the mac/vlan config are still shown as in [3] and not restored to [1] Shouldn't libvirt restore the mac/vlan to [1]. The same problem exists when using <interface type='direct'> (OpenStack macvtap port) but just for the MAC configuration of the VF. [1] - 24: enp3s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq master ovs-system state UP mode DEFAULT group default qlen 1000 link/ether e4:1d:2d:a5:f1:22 brd ff:ff:ff:ff:ff:ff vf 0 MAC 00:00:00:00:00:00, spoof checking off, link-state auto vf 1 MAC 00:00:00:00:00:00, spoof checking off, link-state auto vf 2 MAC 00:00:00:00:00:00, spoof checking off, link-state auto vf 3 MAC 00:00:00:00:00:00, spoof checking off, link-state auto [2] - <interface type='hostdev' managed='yes'> <mac address=' fa:16:3e:11:af:fe '/> <driver name='kvm'/> <source> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x7'/> </source> <vlan> <tag id='190'/> </vlan> <alias name='hostdev0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> [3] 24: enp3s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq master ovs-system state UP mode DEFAULT group default qlen 1000 link/ether e4:1d:2d:a5:f1:22 brd ff:ff:ff:ff:ff:ff vf 0 MAC 00:00:00:00:00:00, spoof checking off, link-state auto vf 1 MAC 00:00:00:00:00:00, spoof checking off, link-state auto vf 2 MAC 00:00:00:00:00:00, spoof checking off, link-state auto vf 3 MAC fa:16:3e:11:af:fe, vlan 190, spoof checking off, link-state enable

3 11

[libvirt] [PATCH] qemu: save config after pivot only if domain is persistent
by Michael Chapman 07 Jan '16

07 Jan '16

When pivoting after a completed block job, only save the domain's persistent configuration if the domain is actually marked persistent. This commit also refactors the logic surrounding the copying of the new disk definition into vm->newDef to avoid a NULL pointer dereference if virStorageSourceCopy were to fail to allocate memory. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_blockjob.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 1d5b7ce..ae936a2 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -116,26 +116,20 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, switch ((virConnectDomainEventBlockJobStatus) status) { case VIR_DOMAIN_BLOCK_JOB_COMPLETED: if (disk->mirrorState == VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT) { - if (vm->newDef) { - virStorageSourcePtr copy = NULL; - - if ((persistDisk = virDomainDiskByName(vm->newDef, - disk->dst, false))) { - copy = virStorageSourceCopy(disk->mirror, false); - if (virStorageSourceInitChainElement(copy, - persistDisk->src, - true) < 0) { - VIR_WARN("Unable to update persistent definition " - "on vm %s after block job", - vm->def->name); - virStorageSourceFree(copy); - copy = NULL; - persistDisk = NULL; - } - } - if (copy) { + if (vm->newDef && + (persistDisk = virDomainDiskByName(vm->newDef, disk->dst, false))) { + virStorageSourcePtr copy = virStorageSourceCopy(disk->mirror, false); + if (copy && virStorageSourceInitChainElement(copy, + persistDisk->src, + true) == 0) { virStorageSourceFree(persistDisk->src); persistDisk->src = copy; + } else { + VIR_WARN("Unable to update persistent definition " + "on vm %s after block job", + vm->def->name); + virStorageSourceFree(copy); + persistDisk = NULL; } } @@ -188,8 +182,8 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) VIR_WARN("Unable to save status on vm %s after block job", vm->def->name); - if (persistDisk && virDomainSaveConfig(cfg->configDir, - vm->newDef) < 0) + if (vm->persistent && persistDisk && + virDomainSaveConfig(cfg->configDir, vm->newDef) < 0) VIR_WARN("Unable to update persistent definition on vm %s " "after block job", vm->def->name); } -- 2.4.3

2 4