- Devel - libvirt List Archives

[libvirt] [PATCH go-xml] Add reconnect support for vhost-user interfaces
by Andrea Bolognani 31 Jan '18

31 Jan '18

Introduced in libvirt commit 614be3b88276. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Does this look like Go to you? Because I have no idea what I'm doing. domain.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/domain.go b/domain.go index 429e61b..4f7725a 100644 --- a/domain.go +++ b/domain.go @@ -392,9 +392,10 @@ type DomainInterfaceSourceEthernet struct { } type DomainInterfaceSourceVHostUser struct { - Type string `xml:"type,attr"` - Path string `xml:"path,attr,omitempty"` - Mode string `xml:"mode,attr,omitempty"` + Type string `xml:"type,attr"` + Path string `xml:"path,attr,omitempty"` + Mode string `xml:"mode,attr,omitempty"` + Reconnect *DomainInterfaceSourceReconnect `xml:"reconnect"` } type DomainInterfaceSourceServer struct { @@ -449,6 +450,11 @@ type DomainInterfaceSourceLocal struct { Port uint `xml:"port,attr,omitempty"` } +type DomainInterfaceSourceReconnect struct { + Enabled string `xml:"enabled,attr"` + Timeout *uint `xml:"timeout,attr"` +} + type DomainInterfaceTarget struct { Dev string `xml:"dev,attr"` } -- 2.14.3

2 1

[libvirt] [PATCH v2] vbox: fix SEGV during dumpxml of a serial port
by Laine Stump 31 Jan '18

31 Jan '18

commit 77a12987a48 changed the "virDomainChrSourceDef source" inside virDomainChrDef to "virDomainChrSourceDefPtr source", and started allocating source inside virDomainChrDefNew(), but vboxDumpSerial() was allocating a virDomainChrDef with a simple VIR_ALLOC() (i.e. never calling virDomainChrDefNew()), so source was never initialized, leading to a SEGV any time a serial port was present. The same problem was created in vboxDumpParallel(). This patch changes vboxDumpSerial() and vboxDumpParallel() to use virDomainChrDefNew() instead of VIR_ALLOC(), and changes both of those functions to return an error if virDomainChrDef() (or any other allocation) fails. This resolves: https://bugzilla.redhat.com/1536649 --- Change from V1: Due to reviews of V1 whining about the patch calling out the lack of returning failure on OOM in a comment rather than fixing it, V2 changes both functions to return 0/-1, and their caller to abort the dumpxml if they return -1. (If I'd taken the extra 30 seconds to look one level up the call chain before posting V1, I would have done that to begin with - there's really nothing complicated about the change, so I'm just as comfortable posting this V2 patch without being able to test as I was with V1). src/vbox/vbox_common.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 33aefabe5..e8381ac95 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3862,7 +3862,7 @@ vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED, } } -static void +static int vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 serialPortCount) { PRUint32 serialPortIncCount = 0; @@ -3886,9 +3886,15 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin } /* Allocate memory for the serial ports which are enabled */ - if ((def->nserials > 0) && (VIR_ALLOC_N(def->serials, def->nserials) >= 0)) { - for (i = 0; i < def->nserials; i++) - ignore_value(VIR_ALLOC(def->serials[i])); + if (def->nserials > 0) { + if (VIR_ALLOC_N(def->serials, def->nserials) < 0) + return -1; + + for (i = 0; i < def->nserials; i++) { + def->serials[i] = virDomainChrDefNew(NULL); + if (!def->serials[i]) + return -1; + } } /* Now get the details about the serial ports here */ @@ -3936,7 +3942,8 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin if (pathUtf16) { VBOX_UTF16_TO_UTF8(pathUtf16, &path); - ignore_value(VIR_STRDUP(def->serials[serialPortIncCount]->source->data.file.path, path)); + if (VIR_STRDUP(def->serials[serialPortIncCount]->source->data.file.path, path) < 0) + return -1; } serialPortIncCount++; @@ -3948,9 +3955,10 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin VBOX_RELEASE(serialPort); } } + return 0; } -static void +static int vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 parallelPortCount) { PRUint32 parallelPortIncCount = 0; @@ -3974,9 +3982,15 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU } /* Allocate memory for the parallel ports which are enabled */ - if ((def->nparallels > 0) && (VIR_ALLOC_N(def->parallels, def->nparallels) >= 0)) { - for (i = 0; i < def->nparallels; i++) - ignore_value(VIR_ALLOC(def->parallels[i])); + if (def->nparallels > 0) { + if (VIR_ALLOC_N(def->parallels, def->nparallels) < 0) + return -1; + + for (i = 0; i < def->nparallels; i++) { + def->parallels[i] = virDomainChrDefNew(NULL); + if (!def->parallels[i]) + return -1; + } } /* Now get the details about the parallel ports here */ @@ -4011,7 +4025,8 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU gVBoxAPI.UIParallelPort.GetPath(parallelPort, &pathUtf16); VBOX_UTF16_TO_UTF8(pathUtf16, &path); - ignore_value(VIR_STRDUP(def->parallels[parallelPortIncCount]->source->data.file.path, path)); + if (VIR_STRDUP(def->parallels[parallelPortIncCount]->source->data.file.path, path) < 0) + return -1; parallelPortIncCount++; @@ -4022,6 +4037,7 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU VBOX_RELEASE(parallelPort); } } + return 0; } static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) @@ -4162,8 +4178,11 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) vboxDumpSharedFolders(def, data, machine); vboxDumpNetwork(def, data, machine, networkAdapterCount); vboxDumpAudio(def, data, machine); - vboxDumpSerial(def, data, machine, serialPortCount); - vboxDumpParallel(def, data, machine, parallelPortCount); + + if (vboxDumpSerial(def, data, machine, serialPortCount) < 0) + goto cleanup; + if (vboxDumpParallel(def, data, machine, parallelPortCount) < 0) + goto cleanup; /* dump USB devices/filters if active */ vboxHostDeviceGetXMLDesc(data, def, machine); -- 2.14.3

2 1

[libvirt] [PATCH 0/2] Fix parsing of iSCSI LUN from JSON backing store strings
by Peter Krempa 31 Jan '18

31 Jan '18

Peter Krempa (2): util: json: Add helper to return string or number properties as string util: storage: Parse 'lun' for iSCSI protocol from JSON as string or number src/util/virjson.c | 27 +++++++++++++++++++++++++++ src/util/virjson.h | 1 + src/util/virstoragefile.c | 13 +++++-------- tests/virstoragetest.c | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) -- 2.15.0

2 4

[libvirt] [PATCH] tests: Remove caps from DO_TEST_PARSE_ERROR() calls
by Andrea Bolognani 31 Jan '18

31 Jan '18

The lack of certain capabilities is going to cause errors pretty much exclusively when building the QEMU command line, because we purposefully leave such checks to the very last moments before starting a guest; so it doesn't make much sense to pass QEMU capabilities to DO_TEST_PARSE_ERROR() call which are supposed, as the name implies, to result in much earlier error. The only exception is the "cpu-hotplug-granularity" test, due to the fact that the checks we want to fail are skipped entirely if the relevant QEMU feature is not available. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuxml2argvtest.c | 184 +++++++++++++---------------------------------- 1 file changed, 51 insertions(+), 133 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c8739909d..2df778853 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -743,9 +743,7 @@ mymain(void) DO_TEST("boot-menu-disable-drive-bootindex", QEMU_CAPS_BOOT_MENU, QEMU_CAPS_BOOTINDEX); - DO_TEST_PARSE_ERROR("boot-dev+order", - QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_VIRTIO_BLK_SCSI); + DO_TEST_PARSE_ERROR("boot-dev+order", NONE); DO_TEST("boot-order", QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_BLK_SCSI); @@ -959,8 +957,7 @@ mymain(void) VIR_FREE(driver.config->vxhsTLSx509certdir); DO_TEST("disk-drive-no-boot", QEMU_CAPS_BOOTINDEX); - DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", NONE); DO_TEST_FAILURE("disk-usb-nosupport", NONE); DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE, @@ -1037,17 +1034,10 @@ mymain(void) QEMU_CAPS_DRIVE_DISCARD, QEMU_CAPS_DRIVE_DETECT_ZEROES); DO_TEST("disk-snapshot", NONE); - DO_TEST_PARSE_ERROR("disk-same-targets", - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("disk-drive-address-conflict", - QEMU_CAPS_ICH9_AHCI); - DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_SCSI_GENERIC); - DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_SCSI_GENERIC); + DO_TEST_PARSE_ERROR("disk-same-targets", NONE); + DO_TEST_PARSE_ERROR("disk-drive-address-conflict", NONE); + DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", NONE); + DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict", NONE); DO_TEST("event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, QEMU_CAPS_VIRTIO_NET_EVENT_IDX, @@ -1060,14 +1050,10 @@ mymain(void) DO_TEST("disk-serial", QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL); - DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address", - NONE); - DO_TEST_PARSE_ERROR("disk-ide-incompatible-address", - NONE); - DO_TEST_PARSE_ERROR("disk-sata-incompatible-address", - QEMU_CAPS_ICH9_AHCI); - DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address", NONE); + DO_TEST_PARSE_ERROR("disk-ide-incompatible-address", NONE); + DO_TEST_PARSE_ERROR("disk-sata-incompatible-address", NONE); + DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address", NONE); DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); @@ -1396,12 +1382,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_CCID_PASSTHRU); - DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_CHARDEV_RECONNECT); - DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout", NONE); + DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", NONE); DO_TEST("usb-controller", QEMU_CAPS_NODEFCONFIG); @@ -1419,10 +1401,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_PARSE_ERROR("usb-ich9-no-companion", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_ICH9_USB_EHCI1); + DO_TEST_PARSE_ERROR("usb-ich9-no-companion", NONE); DO_TEST("usb-ich9-autoassign", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -1437,12 +1416,8 @@ mymain(void) DO_TEST("usb-hub-autoadd-deluxe", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-hub-conflict", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-hub-nonexistent", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-hub-conflict", NONE); + DO_TEST_PARSE_ERROR("usb-hub-nonexistent", NONE); DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); @@ -1452,9 +1427,7 @@ mymain(void) DO_TEST("usb-ports", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-ports-out-of-range", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-ports-out-of-range", NONE); DO_TEST("usb-port-autoassign", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); @@ -1499,13 +1472,9 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-none", QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-none-other", - QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-none-hub", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-none-usbtablet", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-none-other", NONE); + DO_TEST_PARSE_ERROR("usb-none-hub", NONE); + DO_TEST_PARSE_ERROR("usb-none-usbtablet", NONE); DO_TEST("usb-controller-default-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, @@ -1535,19 +1504,14 @@ mymain(void) QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS, QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_NEC_USB_XHCI_PORTS); + DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", NONE); DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); DO_TEST_FAILURE("usb-controller-qemu-xhci-unavailable", NONE); - DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", - QEMU_CAPS_DEVICE_QEMU_XHCI); + DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", NONE); DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE); + DO_TEST_PARSE_ERROR("smbios-date", NONE); + DO_TEST_PARSE_ERROR("smbios-uuid-match", NONE); DO_TEST("watchdog", NONE); DO_TEST("watchdog-device", QEMU_CAPS_NODEFCONFIG); @@ -1601,12 +1565,8 @@ mymain(void) DO_TEST("hostdev-mdev-precreated", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid", NONE); + DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", NONE); DO_TEST_FAILURE("hostdev-vfio-multidomain", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("pci-rom", @@ -1695,7 +1655,7 @@ mymain(void) DO_TEST_FAILURE("luks-disks", QEMU_CAPS_OBJECT_SECRET); # endif DO_TEST_PARSE_ERROR("luks-disk-invalid", NONE); - DO_TEST_PARSE_ERROR("luks-disks-source-both", QEMU_CAPS_OBJECT_SECRET); + DO_TEST_PARSE_ERROR("luks-disks-source-both", NONE); DO_TEST("memtune", NONE); DO_TEST("memtune-unlimited", NONE); @@ -1799,8 +1759,7 @@ mymain(void) DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("pseries-vio-address-clash", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("pseries-vio-address-clash", NONE); DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM); DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI, QEMU_CAPS_DEVICE_USB_KBD, @@ -1809,8 +1768,7 @@ mymain(void) DO_TEST("pseries-cpu-exact", QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("pseries-no-parallel", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("pseries-no-parallel", NONE); qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64); DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, @@ -1898,10 +1856,7 @@ mymain(void) DO_TEST_FAILURE("pseries-hpt-resizing", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_MACHINE_OPT); - DO_TEST_PARSE_ERROR("pseries-hpt-resizing-invalid-machine", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + DO_TEST_PARSE_ERROR("pseries-hpt-resizing-invalid-machine", NONE); DO_TEST("pseries-serial-native", QEMU_CAPS_NODEFCONFIG, @@ -2041,9 +1996,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", NONE); DO_TEST("virtio-rng-ccw", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, @@ -2077,10 +2030,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("s390-no-parallel", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_VIRTIO_CCW, - QEMU_CAPS_VIRTIO_S390); + DO_TEST_PARSE_ERROR("s390-no-parallel", NONE); DO_TEST("s390-serial", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, @@ -2106,8 +2056,7 @@ mymain(void) DO_TEST("tpm-passthrough", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); - DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); + DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", NONE); DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE); @@ -2144,14 +2093,8 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); - DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); - DO_TEST_PARSE_ERROR("q35-dmi-bad-address2", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); + DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", NONE); + DO_TEST_PARSE_ERROR("q35-dmi-bad-address2", NONE); DO_TEST("q35-pm-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, @@ -2382,21 +2325,11 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_HDA_DUPLEX); - DO_TEST_PARSE_ERROR("q35-wrong-root", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_PARSE_ERROR("q35-wrong-root", NONE); DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE); DO_TEST_PARSE_ERROR("440fx-ide-address-conflict", NONE); - DO_TEST_PARSE_ERROR("pcie-root-port-too-many", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_PARSE_ERROR("pcie-root-port-too-many", NONE); DO_TEST("pcie-switch-upstream-port", QEMU_CAPS_DEVICE_IOH3420, @@ -2415,26 +2348,17 @@ mymain(void) DO_TEST("pci-expander-bus", QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_PXB); + DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node", NONE); + DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine", NONE); + DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus", NONE); DO_TEST("pcie-expander-bus", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_PXB_PCIE); + DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine", NONE); + DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", NONE); DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI, @@ -2653,9 +2577,7 @@ mymain(void) DO_TEST_GIC("aarch64-gic-host", GIC_BOTH, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_PARSE_ERROR("aarch64-gic-invalid", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + DO_TEST_PARSE_ERROR("aarch64-gic-invalid", NONE); DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); @@ -2822,14 +2744,8 @@ mymain(void) QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_LOADPARM); - DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", - QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_LOADPARM); - DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", - QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_LOADPARM); + DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", NONE); + DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", NONE); DO_TEST("qemu-ns-domain-ns0", NONE); DO_TEST("qemu-ns-domain-commandline", NONE); @@ -2877,8 +2793,7 @@ mymain(void) DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET); DO_TEST("usb-long-port-path", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); + DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", NONE); DO_TEST("acpi-table", NONE); DO_TEST("intel-iommu", @@ -2915,6 +2830,9 @@ mymain(void) QEMU_CAPS_DEVICE_INTEL_IOMMU); DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); + /* The _QUERY_HOTPLUGGABLE_CPUS capability is needed here because, if + * not present, libvirt will not perform the vCPU hotplug granularity + * validation and the test will pass rather than failing */ DO_TEST_PARSE_ERROR("cpu-hotplug-granularity", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); @@ -2954,9 +2872,9 @@ mymain(void) DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); DO_TEST("cpu-cache-passthrough2", QEMU_CAPS_KVM); DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM); + DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", NONE); + DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", NONE); + DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", NONE); DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO); DO_TEST("user-aliases", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_CIRRUS_VGA, -- 2.14.3

2 2

[libvirt] [PATCH v5 00/16] Move qemu command line controller checks to qemuDomainDeviceDefValidateController* checks
by John Ferlan 31 Jan '18

31 Jan '18

v4: https://www.redhat.com/archives/libvir-list/2017-December/msg00401.html Changes since v4: Insert patch 1 to split the qemuDomainSetSCSIControllerModel as has been discussed during review. Adjustments to the SCSI patches as a result. Added patch 16 from Mark Hartmayer Andrea Bolognani (1): qemu: Add missing checks for pcie-root-port options John Ferlan (14): qemu: Split qemuDomainSetSCSIControllerModel qemu: Introduce qemuDomainDeviceDefValidateControllerAttributes qemu: Move and rename qemuBuildCheckSCSIControllerModel qemu: Move model set for qemuBuildControllerDevStr qemu: Adjust SCSI controller switch in qemuBuildControllerDevStr qemu: Add check for iothread attribute in validate controller qemu: Introduce qemuDomainDeviceDefValidateControllerSCSI qemu: Introduce qemuDomainDeviceDefValidateControllerPCI qemu: Use virDomainPCIControllerOpts in qemuBuildControllerDevStr qemu: Move PCI command modelName check to controller def validate qemu: Move PCI command modelName TypeToString to controller def validate qemu: Move PCI more command checks to controller def validate qemu: Complete PCI command checks to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSATA Marc Hartmayer (1): qemu: Use switch statement for address types in qemuBuildControllerDevStr src/qemu/qemu_alias.c | 4 +- src/qemu/qemu_command.c | 452 +++++---------------------------------- src/qemu/qemu_domain.c | 474 ++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain_address.c | 74 ++----- src/qemu/qemu_domain_address.h | 6 +- tests/qemumemlocktest.c | 14 ++ tests/qemuxml2xmltest.c | 5 +- 7 files changed, 568 insertions(+), 461 deletions(-) -- 2.13.6

4 45

[libvirt] [PATCH] conf: Use correct attribute name in error message
by Andrea Bolognani 30 Jan '18

30 Jan '18

The <capabilities> feature has an attribute named 'policy', but the error message mentioned the non-existing 'state' attribute instead. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. 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 1581f61a4..9c9e3334f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19162,7 +19162,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((tmp = virXMLPropString(nodes[i], "policy"))) { if ((def->features[val] = virDomainCapabilitiesPolicyTypeFromString(tmp)) == -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature '%s'"), + _("unknown policy attribute '%s' of feature '%s'"), tmp, virDomainFeatureTypeToString(val)); goto error; } -- 2.14.3

1 0

[libvirt] [PATCH] storage: util: Properly ignore errors when backing volume is inaccessible
by Peter Krempa 30 Jan '18

30 Jan '18

Commit 000e9504559 tried to fix improper bracketing when refreshing disk volume stats for a backing volume. Unfortunately the condition is still wrong as in cases as the backing store being inaccessible storageBackendUpdateVolTargetInfo returns -2 if instructed to ignore errors. The condition does not take this into account. Dumping XML of a volume which has inacessible backing store would then result into: # virsh vol-dumpxml http.img --pool default error: An error occurred, but the cause is unknown Properly ignore -2 for backing volumes. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1540022 --- src/storage/storage_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 9e1b63a436..61a87b37b6 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1918,7 +1918,7 @@ virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, withBlockVolFormat, VIR_STORAGE_VOL_OPEN_DEFAULT | VIR_STORAGE_VOL_OPEN_NOERROR, - readflags)) < 0) + readflags)) == -1) return ret; return 0; -- 2.15.0

2 1

[libvirt] [PATCH] qemu: Refresh caps cache after booting a different kernel
by Jiri Denemark 30 Jan '18

30 Jan '18

Whenever a different kernel is booted, some capabilities related to KVM (such as CPUID bits) may change. We need to refresh the cache to see the changes. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: The capabilities may also change if a parameter passed to a kvm module changes (kvm_intel.nested is a good example) so this is not a complete solution, but we're hopefully getting closer to it :-) src/qemu/qemu_capabilities.c | 57 +++++++++++++++++++++++++++++++++++++------- src/qemu/qemu_capspriv.h | 1 + tests/qemucapsprobe.c | 2 +- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ab0ea8ec0d..2c573827f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -52,6 +52,7 @@ #include <unistd.h> #include <sys/wait.h> #include <stdarg.h> +#include <sys/utsname.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -510,6 +511,7 @@ struct _virQEMUCaps { unsigned int libvirtVersion; unsigned int microcodeVersion; char *package; + char *kernelVersion; virArch arch; @@ -2303,6 +2305,9 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) if (VIR_STRDUP(ret->package, qemuCaps->package) < 0) goto error; + if (VIR_STRDUP(ret->kernelVersion, qemuCaps->kernelVersion) < 0) + goto error; + ret->arch = qemuCaps->arch; if (qemuCaps->kvmCPUModels) { @@ -2363,6 +2368,7 @@ void virQEMUCapsDispose(void *obj) virBitmapFree(qemuCaps->flags); VIR_FREE(qemuCaps->package); + VIR_FREE(qemuCaps->kernelVersion); VIR_FREE(qemuCaps->binary); VIR_FREE(qemuCaps->gicCapabilities); @@ -3834,6 +3840,7 @@ struct _virQEMUCapsCachePriv { gid_t runGid; virArch hostArch; unsigned int microcodeVersion; + char *kernelVersion; }; typedef struct _virQEMUCapsCachePriv virQEMUCapsCachePriv; typedef virQEMUCapsCachePriv *virQEMUCapsCachePrivPtr; @@ -3845,6 +3852,7 @@ virQEMUCapsCachePrivFree(void *privData) virQEMUCapsCachePrivPtr priv = privData; VIR_FREE(priv->libDir); + VIR_FREE(priv->kernelVersion); VIR_FREE(priv); } @@ -3970,6 +3978,12 @@ virQEMUCapsLoadCache(virArch hostArch, goto cleanup; } + if (virXPathBoolean("boolean(./kernelVersion)", ctxt) > 0) { + qemuCaps->kernelVersion = virXPathString("string(./kernelVersion)", ctxt); + if (!qemuCaps->kernelVersion) + goto cleanup; + } + if (!(str = virXPathString("string(./arch)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing arch in QEMU capabilities cache")); @@ -4248,6 +4262,10 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virBufferAsprintf(&buf, "<package>%s</package>\n", qemuCaps->package); + if (qemuCaps->kernelVersion) + virBufferAsprintf(&buf, "<kernelVersion>%s</kernelVersion>\n", + qemuCaps->kernelVersion); + virBufferAsprintf(&buf, "<arch>%s</arch>\n", virArchToString(qemuCaps->arch)); @@ -4385,14 +4403,24 @@ virQEMUCapsIsValid(void *data, return false; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) && - priv->microcodeVersion != qemuCaps->microcodeVersion) { - VIR_DEBUG("Outdated capabilities for '%s': microcode version changed " - "(%u vs %u)", - qemuCaps->binary, - priv->microcodeVersion, - qemuCaps->microcodeVersion); - return false; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { + if (priv->microcodeVersion != qemuCaps->microcodeVersion) { + VIR_DEBUG("Outdated capabilities for '%s': microcode version " + "changed (%u vs %u)", + qemuCaps->binary, + priv->microcodeVersion, + qemuCaps->microcodeVersion); + return false; + } + + if (STRNEQ_NULLABLE(priv->kernelVersion, qemuCaps->kernelVersion)) { + VIR_DEBUG("Outdated capabilities for '%s': kernel version changed " + "('%s' vs '%s')", + qemuCaps->binary, + priv->kernelVersion, + qemuCaps->kernelVersion); + return false; + } } return true; @@ -5228,6 +5256,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, uid_t runUid, gid_t runGid, unsigned int microcodeVersion, + const char *kernelVersion, bool qmpOnly) { virQEMUCapsPtr qemuCaps; @@ -5284,9 +5313,13 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM); virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU); - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { qemuCaps->microcodeVersion = microcodeVersion; + if (VIR_STRDUP(qemuCaps->kernelVersion, kernelVersion) < 0) + goto error; + } + cleanup: VIR_FREE(qmperr); return qemuCaps; @@ -5309,6 +5342,7 @@ virQEMUCapsNewData(const char *binary, priv->runUid, priv->runGid, priv->microcodeVersion, + priv->kernelVersion, false); } @@ -5397,6 +5431,7 @@ virQEMUCapsCacheNew(const char *libDir, char *capsCacheDir = NULL; virFileCachePtr cache = NULL; virQEMUCapsCachePrivPtr priv = NULL; + struct utsname uts = { 0 }; if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0) goto error; @@ -5417,6 +5452,10 @@ virQEMUCapsCacheNew(const char *libDir, priv->runGid = runGid; priv->microcodeVersion = microcodeVersion; + if (uname(&uts) == 0 && + virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0) + goto error; + cleanup: VIR_FREE(capsCacheDir); return cache; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 98d163b920..222f3368e3 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -37,6 +37,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, uid_t runUid, gid_t runGid, unsigned int microcodeVersion, + const char *kernelVersion, bool qmpOnly); int virQEMUCapsLoadCache(virArch hostArch, diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index a5f5a38b16..7d60246949 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -72,7 +72,7 @@ main(int argc, char **argv) return EXIT_FAILURE; if (!(caps = virQEMUCapsNewForBinaryInternal(VIR_ARCH_NONE, argv[1], "/tmp", - -1, -1, 0, true))) + -1, -1, 0, NULL, true))) return EXIT_FAILURE; virObjectUnref(caps); -- 2.16.0

4 5

[libvirt] How to use /dev/net/tun from libvirt-lxc with user namespacing enabled
by Thiago Padilha 29 Jan '18

29 Jan '18

I have a container rootfs that I use to keep all work-related stuff. This container was originally created by lxd (which creates all containers for use with user namespacing), but now I decided to start using libvirt for container management since I already use it for virtual machines, which will spare me from dealing with multiple hypervisor technologies. I managed to create a working domain xml for the container, and everything seems to be working very well except one thing: I cannot start openconnect (VPN software) inside the container. I noticed that by default libvirt won't create /dev/net/tun for the container, so I added this to the domain xml: <filesystem type='mount'> <source dir='/dev/net'/> <target dir='/dev/net'/> </filesystem> This successfully created /dev/net/tun in the container, but openconnect still can't open it even though it has 666 permissions. It seems this is exactly what lxd does to allow VPNs for their unprivileged containers, as shown by the output of ls -l /dev/net total 0 crw-rw-rw- 1 nobody nogroup 10, 200 Jan 29 13:23 tun The same container can also be successfully booted with systemd-nspawn, also allowing openconnect to create its VPN. I already tried setting security driver to "none" in /etc/libvirt/lxc.conf, but it had no effect. I get "Operation not permitted" when trying to open /dev/net/tun, which is also the message openconnect displays in its logs. Can someone guide me on how I might debug what is causing this error? BTW, here's the full xml: <domain type='lxc'> <name>work-stuff</name> <uuid>ffee008c-ec6b-48ab-af6d-4aba830847a1</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <vcpu placement='static'>16</vcpu> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64'>exe</type> <init>/sbin/init</init> </os> <idmap> <uid start='0' target='165536' count='65536'/> <gid start='0' target='165536' count='65536'/> </idmap> <cpu mode='host-model'> <model fallback='allow'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/libvirt/libvirt_lxc</emulator> <filesystem type='mount' accessmode='passthrough'> <source dir='/var/lib/libvirt/containers/work-stuff/rootfs'/> <target dir='/'/> </filesystem> <filesystem type='mount'> <source dir='/dev/net'/> <target dir='/dev/net'/> </filesystem> <interface type='network'> <mac address='52:54:00:3e:59:e9'/> <source network='default'/> </interface> <console type='pty'> <target type='lxc' port='0'/> </console> </devices> </domain>

1 1

[libvirt] [PATCH 0/4] Tiny updates for virresctrl
by Martin Kletzander 29 Jan '18

29 Jan '18

The first patch is the only interesting one. Martin Kletzander (4): util: Check for empty allocation instead of just NULL pointer util: Use "resctrl" instead of "resctrlfs" spelling util: Make it possible for virResctrlAllocSetMask to replace existing mask util: Remove unused variable in virResctrlGetInfo src/qemu/qemu_process.c | 2 +- src/util/virresctrl.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) -- 2.16.1

2 11

[libvirt] [PATCH] build: Fix broken build on FreeBSD and OSX after recent nodedev series
by Erik Skultety 29 Jan '18

29 Jan '18

Commits f83c7c88 and 6eb1f2b9 broke the build on FreeBSD and OSX because of symbols being undefined for those platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. src/conf/node_device_conf.c | 6 ++++++ src/util/virpci.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index dfd61b7b7..fd8f4e4a9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2806,6 +2806,12 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath, #else int +virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_UNUSED) +{ + return -1; +} + +int virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath ATTRIBUTE_UNUSED, virNodeDevCapPCIDevPtr pci_dev ATTRIBUTE_UNUSED) { diff --git a/src/util/virpci.c b/src/util/virpci.c index b6a5739ca..55e4c3e49 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -3158,6 +3158,15 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path ATTRIBUTE_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } + + +ssize_t +virPCIGetMdevTypes(const char *sysfspath ATTRIBUTE_UNUSED, + virMediatedDeviceTypePtr **types ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -1; +} #endif /* __linux__ */ int -- 2.13.6

1 0

[libvirt] [PATCH 00/15] Nodedev-mdev overhaul
by Erik Skultety 29 Jan '18

29 Jan '18

TL;DR: nodedev: - contained a decent amount of redundant code handling the same thing, now it doesn't. - only updated dynamic capabilities during dumpXML, now it does every time it touches them mdev: - didn't update mdev capabilities at all, now it does This series combines some long-needed refactor changes to the nodedev driver with some necessary mdev fixes based on Wu Zongyong's patch series [1]. There's a lot of simple code movement due to the fact that update of the device capabilities is strictly bound to the nodedev driver. The problem with the existing approach is that in order to properly update all capabilities, especially mdev, we would have to violate the logical code flow we have and call back into the driver to have access to sysfs, i.e. driver->(conf|obj) handling->util_helpers->DRIVER. Therefore to resolve it, along with all the compilation dependencies, I moved most of the capability handling out of the driver into src/conf/node_device_conf.c which already contained more than just parsing and formatting of the capabilities. I also had to move the existing virNodeDevCapMdevType into src/util so that the util helpers would know the type they're working with. [1] https://www.redhat.com/archives/libvir-list/2018-January/msg00315.html Erik Skultety (15): conf: nodedev: Rename virNodeDevObjHasCap to virNodeDevObjHasCapStr conf: nodedev: Rename virNodeDeviceCapMatch to virNodeDevObjHasCap conf: nodedev: Convert virNodeDevObjHasCapStr to a simple wrapper nodedev: Drop the nodeDeviceSysfsGetSCSIHostCaps wrapper nodedev: Move the sysfs-related cap handling to node_device_conf.c nodedev: Export nodeDeviceUpdateCaps from node_device_conf.c nodedev: Introduce virNodeDeviceCapsListExport conf: nodedev: Refresh capabilities before touching them util: mdev: Drop some unused symbols/includes from the header util: mdev: Introduce virMediatedDeviceType structure util: mdev: Introduce virMediatedDeviceTypeReadAttrs getter util: pci: Introduce virPCIGetMdevTypes helper nodedev: udev: Drop the unused mdev type helpers conf: Replace usage of virNodeDevCapMdevType with virMediatedDeviceType conf: nodedev: Update PCI mdev capabilities dynamically src/Makefile.am | 4 +- src/conf/node_device_conf.c | 343 ++++++++++++++++++++++++++++-- src/conf/node_device_conf.h | 29 +-- src/conf/virnodedeviceobj.c | 74 ++----- src/libvirt_private.syms | 7 +- src/node_device/node_device_driver.c | 130 ++--------- src/node_device/node_device_hal.c | 5 +- src/node_device/node_device_linux_sysfs.c | 218 ------------------- src/node_device/node_device_linux_sysfs.h | 34 --- src/node_device/node_device_udev.c | 127 +---------- src/util/virmdev.c | 47 ++++ src/util/virmdev.h | 20 +- src/util/virpci.c | 58 +++++ src/util/virpci.h | 4 + 14 files changed, 516 insertions(+), 584 deletions(-) delete mode 100644 src/node_device/node_device_linux_sysfs.c delete mode 100644 src/node_device/node_device_linux_sysfs.h -- 2.13.6

3 39

[libvirt] [PATCH 0/5] Add optional pSeries features
by Andrea Bolognani 29 Jan '18

29 Jan '18

I consider the first 4 patches ready for inclusion, but the last one - which is basically what justifies going through all this trouble - is sub-optimal until more development has happened in QEMU, so it's marked as RFC. Still, I thought I'd get the ball rolling sooner rather than later. Andrea Bolognani (5): docs: Refactor schema for 'resizing' attribute conf: Add pSeries features conf: Remove obsolete <hpt> feature tests: Clean up HPT tests conf: Add HTM pSeries feature docs/formatdomain.html.in | 39 +++- docs/schemas/domaincommon.rng | 39 +++- src/conf/domain_conf.c | 249 ++++++++++++++++++--- src/conf/domain_conf.h | 14 +- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 9 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 116 ++++++++-- src/qemu/qemu_domain.c | 7 +- ...hpt-resizing.args => pseries-features-hpt.args} | 1 - .../pseries-features-hpt.xml} | 4 +- ...hpt-resizing.args => pseries-features-htm.args} | 3 +- .../pseries-features-htm.xml} | 4 +- ...ne.xml => pseries-features-invalid-machine.xml} | 6 +- tests/qemuxml2argvdata/pseries-hpt-resizing.xml | 19 -- tests/qemuxml2argvtest.c | 12 +- tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-htm.xml | 1 + tests/qemuxml2xmltest.c | 6 +- 19 files changed, 423 insertions(+), 110 deletions(-) copy tests/qemuxml2argvdata/{pseries-hpt-resizing.args => pseries-features-hpt.args} (96%) copy tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => qemuxml2argvdata/pseries-features-hpt.xml} (92%) rename tests/qemuxml2argvdata/{pseries-hpt-resizing.args => pseries-features-htm.args} (86%) rename tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => qemuxml2argvdata/pseries-features-htm.xml} (93%) rename tests/qemuxml2argvdata/{pseries-hpt-resizing-invalid-machine.xml => pseries-features-invalid-machine.xml} (76%) delete mode 100644 tests/qemuxml2argvdata/pseries-hpt-resizing.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-htm.xml -- 2.14.3

2 10

[libvirt] [PATCH v2] virsh: Checking the volume capacity before uploading a new file.
by Julio Faracco 29 Jan '18

29 Jan '18

The current command 'vol-upload' is not checking if the volume accepts a file bigger than its capacity. It can cause an interrupt of the upload stream. This commit adds a check that fails before starting to send new file to volume if the file is bigger. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1529059 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-volume.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 8265a39..04e480c 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -672,6 +672,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) { const char *file = NULL; virStorageVolPtr vol = NULL; + virStorageVolInfo volumeInfo; bool ret = false; int fd = -1; virStreamPtr st = NULL; @@ -679,6 +680,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) unsigned long long offset = 0, length = 0; virshControlPtr priv = ctl->privData; unsigned int flags = 0; + off_t fileLen = -1; virshStreamCallbackData cbData; if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) @@ -701,6 +703,29 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) cbData.ctl = ctl; cbData.fd = fd; + if (virStorageVolGetInfo(vol, &volumeInfo) < 0) + goto cleanup; + + if ((fileLen = virFileLength(file, fd)) < 0) { + vshError(ctl, _("cannot get the file %s length"), file); + goto cleanup; + } + + if (length < fileLen) { + vshError(ctl, _("length parameter is smaller than file size")); + goto cleanup; + } + + if (volumeInfo.capacity < length) { + vshError(ctl, _("lenth parameter is bigger than volume %s capacity"), name); + goto cleanup; + } + + if (volumeInfo.capacity < fileLen + offset) { + vshError(ctl, _("file is bigger than volume %s capacity"), name); + goto cleanup; + } + if (vshCommandOptBool(cmd, "sparse")) flags |= VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM; -- 2.7.4

3 4

[libvirt] [PATCH v3 0/2] Introducing testDomainRename().
by Julio Faracco 29 Jan '18

29 Jan '18

This commit introduces the testDomainRename() for test driver. It includes: - testDomainRename() implementation. - Testcase script to test 'domrename' command. Julio Faracco (2): test: Implementing testDomainRename(). tests: Adding test case for virsh 'domrename' command. src/test/test_driver.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 1 + tests/virsh-rename | 43 ++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100755 tests/virsh-rename -- 2.7.4

2 4

[libvirt] [PATCH] qemu: Fix memory leak in processGuestPanicEvent
by John Ferlan 28 Jan '18

28 Jan '18

After processing the processEvent->data for a qemuProcessEventHandler callout, it's expected that the called processEvent->eventType helper will perform the proper free on the data field. In this case it's a qemuMonitorEventPanicInfoPtr. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Noticed this while working through the DumpComplete patch series. One has to follow the bouncing ball, but will note that when the processEvent->data is passed to other cases, it ends up getting VIR_FREE()'d at the end of various functions, so this should too since it's at the end of the line. 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 a203c9297..5eaf97a46 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4309,6 +4309,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); cleanup: + qemuMonitorEventPanicInfoFree(info); virObjectUnref(cfg); } -- 2.13.6

2 1

[libvirt] [PATCH] tests: Clean up GIC test cases
by Andrea Bolognani 28 Jan '18

28 Jan '18

These test cases are supposed to verify GIC support works as expected, and shouldn't concern themselves with other features; we can trim them down significantly, and make them less likely to need updating after unrelated changes. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuxml2argvdata/aarch64-gic-default.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-host.xml | 2 ++ tests/qemuxml2argvdata/aarch64-gic-invalid.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml | 2 +- tests/qemuxml2argvdata/aarch64-gic-none.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-not-arm.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-not-virt.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-v2.xml | 2 ++ tests/qemuxml2argvdata/aarch64-gic-v3.xml | 2 ++ tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml | 1 + 10 files changed, 18 insertions(+), 31 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.xml b/tests/qemuxml2argvdata/aarch64-gic-default.xml index b219972b3..accfbb0af 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-default.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <features> <gic/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.xml b/tests/qemuxml2argvdata/aarch64-gic-host.xml index b14d14281..561f6edc6 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-host.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-host.xml @@ -18,5 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.xml b/tests/qemuxml2argvdata/aarch64-gic-invalid.xml index 1cf9ea88d..98566b86d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-invalid.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-invalid.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <features> <gic version='none'/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml index 0aa33dbec..64745f3e0 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml @@ -5,13 +5,13 @@ <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <cpu mode='custom'> <model>cortex-a57</model> </cpu> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.xml b/tests/qemuxml2argvdata/aarch64-gic-none.xml index 272d0c857..302c132a3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-none.xml @@ -2,18 +2,14 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml b/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml index 3b907bc41..e33bca0ef 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='ppc64' machine='pseries'>hvm</type> - <boot dev='hd'/> </os> <features> <gic/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml b/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml index 256664ed8..12148d99e 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='not-virt'>hvm</type> - <boot dev='hd'/> </os> <features> <gic/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.xml b/tests/qemuxml2argvdata/aarch64-gic-v2.xml index 8b9983752..f451c87b7 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v2.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-v2.xml @@ -18,5 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-v3.xml index bde94e16c..f3a6b9283 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.xml @@ -18,5 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml index a0cd0b768..b97843970 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml @@ -20,6 +20,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> <memballoon model='none'/> </devices> </domain> -- 2.14.3

2 1

[libvirt] [PATCH 0/1] WIP: try to implement volume rename
by Vasiliy Tolstov 26 Jan '18

26 Jan '18

This is incomplete work for implementing volume rename in libvirt I'm try to impelemnt it for some backends. First missing part is remote rpc call, and second - tests. If somebody can/want to help me, i'll very happy. Vasiliy Tolstov (1): [WIP] implement vol rename include/libvirt/libvirt-storage.h | 3 ++ m4/virt-storage-lvm.m4 | 3 ++ src/libvirt-storage.c | 39 +++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 8 ++++- src/remote/remote_driver.c | 1 + src/storage/storage_backend_fs.c | 3 ++ src/storage/storage_backend_logical.c | 27 +++++++++++++++ src/storage/storage_backend_rbd.c | 28 +++++++++++++++ src/storage/storage_backend_vstorage.c | 1 + src/storage/storage_driver.c | 63 ++++------------------------------ src/storage/storage_util.c | 13 +++++++ src/storage/storage_util.h | 5 +++ src/util/virstoragefile.c | 39 +++++++++++++++++++++ tools/virsh-volume.c | 53 ++++++++++++++++++++++++++++ 15 files changed, 229 insertions(+), 58 deletions(-) -- 2.14.3

1 1

[libvirt] [REBASE PATCH v2 0/9] Implement query-dump command
by John Ferlan 26 Jan '18

26 Jan '18

https://www.redhat.com/archives/libvir-list/2018-January/msg00128.html Rebase the patches to 71d56a397925a1bd55d3aee30afdbdcd1a14f9a8 since 4.0.0 is released and the capabilities were adjusted. I also note fromt the archives that Michal responded to the series: https://www.redhat.com/archives/libvir-list/2018-January/msg00154.html but that never made it to my inbox (curses, the Red Hat email processing sometimes is very, very delayed). Anyway, the only difference for this series is the addition of patch 9 to generate a news.xml article. John Ferlan (9): qemu: Add support for DUMP_COMPLETED event qemu: Introduce qemuProcessHandleDumpCompleted qemu: Introduce qemuMonitor[JSON]QueryDump qemu: Add new parameter to qemuMonitorDumpToFd qemu: Introduce qemuDomainGetJobInfoMigrationStats qemu: Introduce qemuDomainGetJobInfoDumpStats qemu: Add dump completed event to the capabilities qemu: Allow showing the dump progress for memory only dump docs: Add news article for query memory-only dump processing percentage docs/news.xml | 11 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 146 ++++++++++++++++++--- src/qemu/qemu_monitor.c | 39 +++++- src/qemu/qemu_monitor.h | 33 ++++- src/qemu/qemu_monitor_json.c | 104 ++++++++++++++- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_process.c | 23 ++++ .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 3 +- 28 files changed, 363 insertions(+), 26 deletions(-) -- 2.13.6

2 19

[libvirt] [PATCHv4 RESEND] vhost-user: add support reconnect for vhost-user ports
by ZhiPeng Lu 26 Jan '18

26 Jan '18

For vhost-user ports, Open vSwitch acts as the server and QEMU the client. When OVS crashes or restarts, the QEMU process should be reconnected to OVS. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v1->v2: - modify xml format v2->v3: - fix commit message syntax - reimplemente functions and the struct about reconnect v3->v4: - revert reimplemente functions and the struct about reconnect --- docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 26 ++-- src/conf/domain_conf.c | 158 +++++++++++++---------- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 12 +- tests/qemuxml2argvdata/net-vhostuser-multiq.xml | 11 +- 5 files changed, 127 insertions(+), 87 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d272cc1..f0f9f4b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5832,7 +5832,9 @@ qemu-kvm -net nic,model=? /dev/null </interface> <interface type='vhostuser'> <mac address='52:54:00:3b:83:1b'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> <model type='virtio'/> <driver queues='5'/> </interface> @@ -5848,6 +5850,9 @@ qemu-kvm -net nic,model=? /dev/null are supported. vhost-user requires the virtio model type, thus the <code><model></code> element is mandatory. + Since 3.10.0 the element has an optional + attribute <code>reconnect</code> which configures reconnect timeout + (in seconds) if the connection is lost. <h5><a id="elementNwfilter">Traffic filtering with NWFilter</a></h5> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f22c932..9258c7d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2399,6 +2399,18 @@ </attribute> </optional> </define> + <define name="reconnect"> + <element name="reconnect"> + <attribute name="enabled"> + <ref name="virYesNo"/> + </attribute> + <optional> + <attribute name="timeout"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </define> <!-- An interface description can either be of type bridge in which case @@ -2460,6 +2472,9 @@ <value>client</value> </choice> </attribute> + <optional> + <ref name="reconnect"/> + </optional> <empty/> </element> <ref name="interface-options"/> @@ -3728,16 +3743,7 @@ </attribute> </optional> <optional> - <element name="reconnect"> - <attribute name="enabled"> - <ref name="virYesNo"/> - </attribute> - <optional> - <attribute name="timeout"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </element> + <ref name="reconnect"/> </optional> <zeroOrMore> <ref name='devSeclabel'/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1c2506..ccc8ff7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10695,6 +10695,56 @@ virDomainNetAppendIPAddress(virDomainNetDefPtr def, return -1; } +static int +virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + int ret = -1; + int tmpVal; + char *tmp = NULL; + xmlNodePtr saveNode = ctxt->node; + xmlNodePtr cur; + + ctxt->node = node; + + if ((cur = virXPathNode("./reconnect", ctxt))) { + if ((tmp = virXMLPropString(cur, "enabled"))) { + if ((tmpVal = virTristateBoolTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid reconnect enabled value: '%s'"), + tmp); + goto cleanup; + } + def->enabled = tmpVal; + VIR_FREE(tmp); + } + + if (def->enabled == VIR_TRISTATE_BOOL_YES) { + if ((tmp = virXMLPropString(cur, "timeout"))) { + if (virStrToLong_ui(tmp, NULL, 10, &def->timeout) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid reconnect timeout value: '%s'"), + tmp); + goto cleanup; + } + VIR_FREE(tmp); + } else { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing timeout for chardev with " + "reconnect enabled")); + goto cleanup; + } + } + } + + ret = 0; + cleanup: + ctxt->node = saveNode; + VIR_FREE(tmp); + return ret; +} + /* Parse the XML definition for a network interface * @param node XML nodeset to parse for net definition * @return 0 on success, -1 on failure @@ -10749,6 +10799,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; + virDomainChrSourceReconnectDef reconnect = {0}; int rv, val; if (VIR_ALLOC(def) < 0) @@ -10830,11 +10881,14 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type - && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && - virXMLNodeNameEqual(cur, "source")) { + && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER + && virXMLNodeNameEqual(cur, "source")) { vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); + if (virDomainChrSourceReconnectDefParseXML(&reconnect, cur, ctxt) < 0) + goto error; + } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -11056,8 +11110,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; + if (reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for <interface type='vhostuser'>")); + goto error; + } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; + def->data.vhostuser->data.nix.reconnect.enabled = reconnect.enabled; + def->data.vhostuser->data.nix.reconnect.timeout = reconnect.timeout; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -11763,57 +11825,6 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, return ret; } -static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, - xmlNodePtr node, - xmlXPathContextPtr ctxt) -{ - int ret = -1; - int tmpVal; - char *tmp = NULL; - xmlNodePtr saveNode = ctxt->node; - xmlNodePtr cur; - - ctxt->node = node; - - if ((cur = virXPathNode("./reconnect", ctxt))) { - if ((tmp = virXMLPropString(cur, "enabled"))) { - if ((tmpVal = virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect enabled value: '%s'"), - tmp); - goto cleanup; - } - def->enabled = tmpVal; - VIR_FREE(tmp); - } - - if (def->enabled == VIR_TRISTATE_BOOL_YES) { - if ((tmp = virXMLPropString(cur, "timeout"))) { - if (virStrToLong_ui(tmp, NULL, 10, &def->timeout) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect timeout value: '%s'"), - tmp); - goto cleanup; - } - VIR_FREE(tmp); - } else { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing timeout for chardev with " - "reconnect enabled")); - goto cleanup; - } - } - } - - ret = 0; - cleanup: - ctxt->node = saveNode; - VIR_FREE(tmp); - return ret; -} - - typedef enum { VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT, VIR_DOMAIN_CHR_SOURCE_MODE_BIND, @@ -23634,6 +23645,21 @@ virDomainVirtioNetDriverFormat(char **outstr, return 0; } +static void +virDomainChrSourceReconnectDefFormat(virBufferPtr buf, + virDomainChrSourceReconnectDefPtr def) +{ + if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) + return; + + virBufferAsprintf(buf, "<reconnect enabled='%s'", + virTristateBoolTypeToString(def->enabled)); + + if (def->enabled == VIR_TRISTATE_BOOL_YES) + virBufferAsprintf(buf, " timeout='%u'", def->timeout); + + virBufferAddLit(buf, "/>\n"); +} int virDomainNetDefFormat(virBufferPtr buf, @@ -23728,6 +23754,14 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.vhostuser->data.nix.listen ? "server" : "client"); sourceLines++; + if (def->data.vhostuser->data.nix.reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + virBufferAdjustIndent(buf, 2); + virDomainChrSourceReconnectDefFormat(buf, &def->data.vhostuser->data.nix.reconnect); + virBufferAdjustIndent(buf, -2); + } + } break; @@ -23960,24 +23994,6 @@ virDomainChrAttrsDefFormat(virBufferPtr buf, return 0; } - -static void -virDomainChrSourceReconnectDefFormat(virBufferPtr buf, - virDomainChrSourceReconnectDefPtr def) -{ - if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) - return; - - virBufferAsprintf(buf, "<reconnect enabled='%s'", - virTristateBoolTypeToString(def->enabled)); - - if (def->enabled == VIR_TRISTATE_BOOL_YES) - virBufferAsprintf(buf, " timeout='%u'", def->timeout); - - virBufferAddLit(buf, "/>\n"); -} - - static int virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefPtr def, diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args index b69ebd8..f2aec7b 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -32,7 +32,11 @@ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock \ --netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ --device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ -mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 +-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \ +-netdev vhost-user,chardev=charnet3,id=hostnet3 \ +-device virtio-net-pci,netdev=hostnet3,id=net3,\ +mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 \ +-chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \ +-netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \ +-device virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,\ +mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml index d5c42fe..a30cce6 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml @@ -40,7 +40,16 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> + <model type='virtio'/> + </interface> + <interface type='vhostuser'> + <mac address='52:54:00:ee:96:6e'/> + <source type='unix' path='/tmp/vhost3.sock' mode='client'> + <reconnect enabled='no'/> + </source> <model type='virtio'/> <driver queues='4'/> </interface> -- 1.8.3.1

2 1

Re: [libvirt] [PATCH RESEND v1 1/2] i386: Add Intel Processor Trace feature support
by Eduardo Habkost 26 Jan '18

26 Jan '18

CCing libvirt developers. On Mon, Jan 15, 2018 at 10:33:35AM +0100, Paolo Bonzini wrote: > On 15/01/2018 08:19, Kang, Luwei wrote: > >> If you are forwarding host info directly to the guest, the feature > >> is not migration-safe. The new feature needs to be added to > >> feature_word_info[FEAT_7_0_EBX].unmigratable_flags. > >> > > Hi, Thanks for you review. I want to support Intel PT live migration > > and patch [2/2] to do this. I don't understand why need to add this > > feature in feature_word_info[FEAT_7_0_EBX].unmigratable_flags first > > to disable live migration. > > Hi Luwei, > > the issue is that different hosts can have different CPUID flags. You > don't have a way to set the CPUID flags from the "-cpu" command line, > and it's not clear what values will be there in the various Ice Lake SKUs. > > I am not sure if there is a mechanism to allow live migration only for > "-cpu host", but it cannot be supported for any other "-cpu" model. IIRC, we don't have any mechanism to actually prevent migration if an unmigratable flag is enabled. We just avoid enabling them by accident on "-cpu host". This case is slightly more problematic, however: the new feature is actually migratable (under very controlled circumstances) because of patch 2/2, but it is not migration-safe[1]. This means libvirt shouldn't include it in "host-model" expansion (which uses the query-cpu-model-expansion QMP command) until we make the feature migration-safe. For QEMU, this means the feature shouldn't be returned by "query-cpu-model-expansion type=static model=max" (but it can be returned by "query-cpu-model-expansion type=full model=max"). Jiri, it looks like libvirt uses type=full on query-cpu-model-expansion on x86. It needs to use type=static[2], or it will have no way to find out if a feature is migration-safe or not. This case is similar to "pmu", which is not migration-safe but enabled by -cpu host by default. But "pmu" is less problematic because it is already skipped by query-cpu-model-expansion type=static. --- [1] "migration-safe" is defined in the documentation for CpuDefinitionInfo on the QAPI schema: # @migration-safe: whether a CPU definition can be safely used for # migration in combination with a QEMU compatibility machine # when migrating between different QMU versions and between # hosts with different sets of (hardware or software) # capabilities. If not provided, information is not available # and callers should not assume the CPU definition to be # migration-safe. (since 2.8) [2] It looks like libvirt uses type=full because it wants to get all QOM property aliases returned. In this case, one solution for libvirt is to use: static_expansion = query_cpu_model_expansion(type=static, model) all_props = query_cpu_model_expansion(type=full, static_expansion) -- Eduardo

4 16

[libvirt] [PATCH] docs: Add missing element encryption description term entry
by John Ferlan 25 Jan '18

25 Jan '18

Missed adding the "encryption" description term entry to the list of possible sub-elements for disk source. The description details were there, just not the tag. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Found this while looking at Michal's persistent reservations series. Pushing as trivial - it doesn't cause a conflict with that series. docs/formatdomain.html.in | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 41ba4d41e..cf0654497 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2824,6 +2824,7 @@ attribute matching the key that was specified in the secret object. </dd> + <dt><code>encryption</code></dt> <dd>Since libvirt 3.9.0, the <code>encryption</code> can be a sub-element of the <code>source</code> element for encrypted storage sources. -- 2.13.6

1 0

[libvirt] [PATCH hooks 0/1] Enforce requirement for Signed-off-by line
by Daniel P. Berrange 25 Jan '18

25 Jan '18

As a general rule most libvirt commits in recent history have have a valid Signed-off-by line present. There are still cases, however, where this is being forgotten. It is time to put some checks on git pushes to detect missinged Signed-off-by lines and reject the push. I created a new git repository that contains the original git repository update hook Eric provided years back. This commit then augments that hook to add the Signed-off-by check. The updated hook gets automatically installed on the server when we push to this repo. Daniel P. Berrange (1): Add check for Signed-off-by in commit messages update | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.14.3

8 16

[libvirt] [PATCH 0/2] vsh: Print help for the aliased cmd rather than the alias itself
by Erik Skultety 25 Jan '18

25 Jan '18

The alias doesn't have any definition rather than a reference for the aliased command. Therefore when printing help, we have to print help for the aliased command, otherwise our faith is going to be met with SIGSEGV. Erik Skultety (2): vsh: Drop redundant definition searches from vshCmd{def,Grp}Help vsh: Cmd aliases lookups should return results for the aliased command tools/vsh.c | 45 +++++++++++++++++---------------------------- tools/vsh.h | 4 ++-- 2 files changed, 19 insertions(+), 30 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH v2 0/4] qemu: use arp table of host to get the
by Chen Hanxiao 25 Jan '18

25 Jan '18

introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the output of /proc/net/arp Chen Hanxiao (4): util: introduce helper to parse /proc/net/arp qemu: introduce qemuARPGetInterfaces to get IP from host's arp table virsh: add --source arp to domifaddr news: qemu: use arp table of host to get the IP address of guests docs/news.xml | 5 +++ include/libvirt/libvirt-domain.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++++++++++++++ src/util/virmacaddr.c | 67 +++++++++++++++++++++++++++++++++++ src/util/virmacaddr.h | 18 ++++++++++ tools/virsh-domain-monitor.c | 2 ++ tools/virsh.pod | 7 ++-- 8 files changed, 174 insertions(+), 3 deletions(-) -- 2.14.3

2 8

[libvirt] [PATCH v3] docs: formatdomain: Document the CPU feature 'name' attribute
by Kashyap Chamarthy 25 Jan '18

25 Jan '18

Currently, the CPU feature 'name' XML attribute, as in: [...] <cpu match='exact'> <model fallback='forbid'>IvyBridge</model> <vendor>Intel</vendor> <feature policy='require' name='pcid'/> </cpu> [...] isn't explicitly documented in formatdomain.html. Document it now. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- v3: - Wrap text in paragraph; fix phrasing [John Ferlan] v2: - Remove redundant line [Eduardo Habkost] docs/formatdomain.html.in | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d272cc1ba..fc0885420 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1454,6 +1454,21 @@ Since 0.8.5 the <code>policy</code> attribute can be omitted and will default to <code>require</code>. + + Individual CPU feature names are specified as part of the + <code>name</code> attribute. For example, to explicitly specify + the 'pcid' feature with Intel IvyBridge CPU model: + + +<pre> +... +<cpu match='exact'> + <model fallback='forbid'>IvyBridge</model> + <vendor>Intel</vendor> + <feature policy='require' name='pcid'/> +</cpu> +...</pre> + </dd> <dt><code>cache</code></dt> -- 2.13.6

2 1

[libvirt] [PATCH] libxl: resume lock process after failed migration
by Jim Fehlig 25 Jan '18

25 Jan '18

During migration, the lock process is paused in the perform phase but not resumed if there is a subsequent failure, leaving the locked resource unprotected. The perform phase itself can fail, in which case the lock process should be resumed before returning from perform. The finish phase could also fail on the destination host, in which case the migration is canceled in the confirm phase and the VM is resumed. The lock process needs to be resumed there as well. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_migration.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 228c8508c..a7a578c72 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1238,6 +1238,12 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, ret = libxlDoMigrateSend(driver, vm, flags, sockfd); virObjectLock(vm); + if (ret < 0) + virDomainLockProcessResume(driver->lockManager, + "xen:///system", + vm, + priv->lockState); + cleanup: VIR_FORCE_CLOSE(sockfd); virURIFree(uri); @@ -1349,10 +1355,16 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, int cancelled) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; virObjectEventPtr event = NULL; int ret = -1; if (cancelled) { + /* Resume lock process that was paused in MigrationPerform */ + virDomainLockProcessResume(driver->lockManager, + "xen:///system", + vm, + priv->lockState); if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) == 0) { ret = 0; } else { -- 2.16.0

2 1

[libvirt] [PATCH v2] docs: formatdomain: Document the CPU feature 'name' attribute
by Kashyap Chamarthy 25 Jan '18

25 Jan '18

Currently, the CPU feature 'name' XML attribute, as in: [...] <cpu match='exact'> <model fallback='forbid'>IvyBridge</model> <vendor>Intel</vendor> <feature policy='require' name='pcid'/> </cpu> [...] isn't explicitly documented in formatdomain.html. Document it now. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- v2: - Remove redundant line [Eduardo Habkost] docs/formatdomain.html.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d272cc1ba..a6d40411c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1454,6 +1454,20 @@ Since 0.8.5 the <code>policy</code> attribute can be omitted and will default to <code>require</code>. + + Individual CPU feature names can be specified as part of the + <code>name</code> attribute. For example, to explicitly specify + the 'pcid' feature with Intel IvyBridge CPU model: + +<pre> +... +<cpu match='exact'> + <model fallback='forbid'>IvyBridge</model> + <vendor>Intel</vendor> + <feature policy='require' name='pcid'/> +</cpu> +...</pre> + </dd> <dt><code>cache</code></dt> -- 2.13.6

3 6

[libvirt] [PATCH v2 0/2] Support SMBIOS OEM strings
by Daniel P. Berrange 25 Jan '18

25 Jan '18

A followup to https://www.redhat.com/archives/libvir-list/2017-November/msg00720.html The QEMU patch is now merged (for next 2.12 release). Since v2: - Remove redundant error message report - Split QEMU from XML parts of patch Daniel P. Berrange (2): conf: add support for setting OEM strings SMBIOS data fields qemu: add support for generating SMBIOS OEM strings command line docs/formatdomain.html.in | 13 ++++++++++ docs/schemas/domaincommon.rng | 9 +++++++ src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 28 ++++++++++++++++++++++ src/util/virsysinfo.c | 33 ++++++++++++++++++++++++++ src/util/virsysinfo.h | 10 ++++++++ tests/qemuxml2argvdata/smbios.args | 2 ++ tests/qemuxml2argvdata/smbios.xml | 5 ++++ tests/qemuxml2xmloutdata/smbios.xml | 5 ++++ 9 files changed, 152 insertions(+) -- 2.14.3

3 7

[libvirt] [PATCH] vbox: fix SEGV during dumpxml of a serial port
by Laine Stump 25 Jan '18

25 Jan '18

commit 77a12987a48 changed the "virDomainChrSourceDef source" inside virDomainChrDef to "virDomainChrSourceDefPtr source", and started allocating source inside virDomainChrDefNew(), but vboxDumpSerial() was allocating a virDomainChrDef with a simple VIR_ALLOC(), so source was never initialized, leading to a SEGV any time a serial port was present. The same problem was created in vboxDumpParallel(). This patch changes vboxDumpSerial() and vboxDumpParallel() to use virDomainChrDefNew() instead of VIR_ALLOC(), and makes a cursory attempt to "recover" from OOM afterwards (much of the vbox code was written to assume success, e.g. by having functions return void. Since I have no way to test a more sweeping change to this code, I chose to just short-circuit the rest of the function if virDomainChrDefNew() fails - this is at least one step better than the previous code, which would otherwise end up trying to dereference a NULL def->serials[i] and crash libvirtd. This resolves: https://bugzilla.redhat.com/1536649 --- src/vbox/vbox_common.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 33aefabe5..c5fa5f08b 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3887,8 +3887,19 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin /* Allocate memory for the serial ports which are enabled */ if ((def->nserials > 0) && (VIR_ALLOC_N(def->serials, def->nserials) >= 0)) { - for (i = 0; i < def->nserials; i++) - ignore_value(VIR_ALLOC(def->serials[i])); + for (i = 0; i < def->nserials; i++) { + def->serials[i] = virDomainChrDefNew(NULL); + if (!def->serials[i]) { + /* there is no provision for returning an error + * (although the libvirtd logs will show an OOM error), + * but we need to at least prevent dereferencing + * def->serials[i] and later (including continuing in + * this function), as it will otherwise cause a SEGV. + */ + def->nserials = i; + return; + } + } } /* Now get the details about the serial ports here */ @@ -3975,8 +3986,19 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU /* Allocate memory for the parallel ports which are enabled */ if ((def->nparallels > 0) && (VIR_ALLOC_N(def->parallels, def->nparallels) >= 0)) { - for (i = 0; i < def->nparallels; i++) - ignore_value(VIR_ALLOC(def->parallels[i])); + for (i = 0; i < def->nparallels; i++) { + def->parallels[i] = virDomainChrDefNew(NULL); + if (!def->parallels[i]) { + /* there is no provision for returning an error + * (although the libvirtd logs will show an OOM error), + * but we need to at least prevent dereferencing + * def->parallels[i] and later (including continuing in + * this function), as it will otherwise cause a SEGV. + */ + def->nparallels = i; + return; + } + } } /* Now get the details about the parallel ports here */ -- 2.14.3

3 2

[libvirt] [PATCH 00/14] Misc build refactoring / isolation work
by Daniel P. Berrangé 25 Jan '18

25 Jan '18

This was triggered by the recent Fedora change to add '-z defs' to RPM builds by default which breaks libvirt. Various make rule changes can fix much of the problem, but it also requires source refactoring to get rid of places where virt drivers directly call into the storage/network drivers. Co-incidentally this work will also be useful in allowing us to separate out drivers to distinct daemons. Daniel P. Berrangé (14): storage: extract storage file backend from main storage driver backend storage: move storage file backend framework into util directory rpc: don't link in second copy of RPC code to libvirtd & lockd plugin conf: introduce callback registration for domain net device allocation conf: expand network device callbacks to cover bandwidth updates qemu: replace networkGetNetworkAddress with public API calls conf: expand network device callbacks to cover resolving NIC type network: remove conditional declarations conf: move virStorageTranslateDiskSourcePool into domain conf storage: export virStoragePoolLookupByTargetPath as a public API build: explicitly link all modules with libvirt.so build: provide a AM_FLAGS_MOD for loadable modules build: passing the "-z defs" linker flag to prevent undefined symbols build: link libvirt_lxc against libvirt.so configure.ac | 1 + daemon/Makefile.am | 4 +- include/libvirt/libvirt-storage.h | 2 + m4/virt-linker-no-undefined.m4 | 32 ++ po/POTFILES.in | 2 +- src/Makefile.am | 142 ++++---- src/bhyve/bhyve_command.c | 6 +- src/conf/domain_conf.c | 355 +++++++++++++++++++ src/conf/domain_conf.h | 71 ++++ src/driver-storage.h | 5 + src/libvirt-storage.c | 40 +++ src/libvirt_private.syms | 29 ++ src/libvirt_public.syms | 6 + src/libvirt_remote.syms | 11 +- src/libxl/libxl_domain.c | 4 +- src/libxl/libxl_driver.c | 6 +- src/lxc/lxc_driver.c | 4 +- src/lxc/lxc_process.c | 6 +- src/network/bridge_driver.c | 144 ++------ src/network/bridge_driver.h | 72 ---- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_driver.c | 13 +- src/qemu/qemu_hotplug.c | 16 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 113 +++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 7 + src/security/virt-aa-helper.c | 2 - src/storage/storage_backend.c | 66 ---- src/storage/storage_backend.h | 75 ---- src/storage/storage_backend_fs.c | 8 +- src/storage/storage_backend_gluster.c | 4 +- src/storage/storage_driver.c | 256 +------------- src/storage/storage_driver.h | 3 - src/storage/storage_source.c | 645 ---------------------------------- src/storage/storage_source.h | 59 ---- src/util/virstoragefile.c | 609 +++++++++++++++++++++++++++++++- src/util/virstoragefile.h | 32 ++ src/util/virstoragefilebackend.c | 108 ++++++ src/util/virstoragefilebackend.h | 104 ++++++ tests/virstoragetest.c | 1 - tools/Makefile.am | 1 + 45 files changed, 1668 insertions(+), 1421 deletions(-) create mode 100644 m4/virt-linker-no-undefined.m4 delete mode 100644 src/storage/storage_source.c delete mode 100644 src/storage/storage_source.h create mode 100644 src/util/virstoragefilebackend.c create mode 100644 src/util/virstoragefilebackend.h -- 2.14.3

2 21

[libvirt] [PATCH 00/10] Cache Allocation Technology support, this time for real (??)
by Martin Kletzander 25 Jan '18

25 Jan '18

So again all the reviews are incorporated. I managed to get my hands on a machine with CAT support, so I also found out some things that needed tweaking. @Eli: I would still appreciate you helping with some testing as I wasn't able to find a machine with multiple caches (sockets) and I couldn't test that properly (mainly the fact that full mask needs to be specified for caches for which we don't want any allocation to happen). Martin Kletzander (10): Rename virResctrlInfo to virResctrlInfoPerCache util: Add virResctrlInfo conf: Use virResctrlInfo in capabilities util: Remove now-unneeded resctrl functions resctrl: Add functions to work with resctrl allocations conf: Add support for cputune/cachetune tests: Add virresctrltest qemu: Add support for resctrl docs: Add CAT (resctrl) support into news.xml tests: Clean up and modify some vircaps2xmldata docs/formatdomain.html.in | 54 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 32 + po/POTFILES.in | 1 + src/Makefile.am | 2 +- src/conf/capabilities.c | 55 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 295 +++- src/conf/domain_conf.h | 13 + src/libvirt_private.syms | 15 +- src/qemu/qemu_process.c | 60 +- src/util/virresctrl.c | 1542 ++++++++++++++++++-- src/util/virresctrl.h | 73 +- src/util/virresctrlpriv.h | 27 + tests/Makefile.am | 9 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 36 + .../cachetune-colliding-allocs.xml | 30 + .../cachetune-colliding-tunes.xml | 32 + .../cachetune-colliding-types.xml | 30 + tests/genericxml2xmlindata/cachetune-small.xml | 29 + tests/genericxml2xmlindata/cachetune.xml | 33 + tests/genericxml2xmltest.c | 10 + .../vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus | 1 - .../linux-resctrl-cdp/resctrl/tasks | 0 .../linux-resctrl-skx-twocaches/resctrl/schemata | 2 +- tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 - .../vircaps2xmldata/linux-resctrl/resctrl/schemata | 2 +- tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0 tests/virresctrldata/resctrl-cdp.schemata | 2 + .../virresctrldata/resctrl-skx-twocaches.schemata | 1 + tests/virresctrldata/resctrl-skx.schemata | 1 + tests/virresctrldata/resctrl.schemata | 1 + tests/virresctrltest.c | 102 ++ 33 files changed, 2363 insertions(+), 141 deletions(-) create mode 100644 src/util/virresctrlpriv.h create mode 100644 tests/genericxml2xmlindata/cachetune-cdp.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-tunes.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-types.xml create mode 100644 tests/genericxml2xmlindata/cachetune-small.xml create mode 100644 tests/genericxml2xmlindata/cachetune.xml delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks create mode 100644 tests/virresctrldata/resctrl-cdp.schemata create mode 100644 tests/virresctrldata/resctrl-skx-twocaches.schemata create mode 100644 tests/virresctrldata/resctrl-skx.schemata create mode 100644 tests/virresctrldata/resctrl.schemata create mode 100644 tests/virresctrltest.c -- 2.16.1

2 24

[libvirt] [PATCH] docs: document requirement to provide Signed-off-by lines for DCO
by Daniel P. Berrange 25 Jan '18

25 Jan '18

Document that contributors are required to assert compliance with the Developers Certification of Origin 1.1, by providing Signed-off-by tags for all commit messages. The DCO is formally stating what we have long implicitly expected of contributors in terms of their legal rights to make the contribution. This puts the project in a stronger position should any questions around contributions be raised going forward in the future. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/hacking.html.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 6cadfb8343..98a24d785c 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -108,12 +108,18 @@ of the bug number is useful; but also summarize the issue rather than making all readers follow the link. You can use 'git shortlog -30' to get an idea of typical summary lines. - Libvirt does not currently attach any meaning to - Signed-off-by: lines, so it is up to you if you want to - include or omit them in the commit message. </li> + <li>Contributors to libvirt projects must + assert that they are in compliance with the + <a href="https://developercertificate.org/">Developers + Certificate of Origin 1.1</a>. This is achieved by adding + a "Signed-off-by" line to every commit message. The presence + of this line attests that the contributor has read the + above lined DCO and agrees with its statements. + </li> + <li>Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits -- 2.14.3

5 6

[libvirt] [PATCH v3 0/3] nodedev: update caps before quering nodedev infos
by Wu Zongyong 25 Jan '18

25 Jan '18

Some capabilities of node devices rely on what driver they bound to, and therefore, these capabilities may change when the driver change. In current implemention, it is not consistent between real status and the status we get by invoking nodedev interfaces. So, this series of patches try to manually update devices' capabilities each time before nodedev driver interfaces invoked. Wu Zongyong (3): v2->v3: 1. split a single patch to three part 2. fix memory leak and lock problems 3. update caps before invoking nodedev driver interfaces (refer to patch 3/3) nodedev: add macro guard to node_device_udev header file nodedev: update mdev_types caps before dumpxml nodedev: update caps before invoking nodedev driver interfaces src/node_device/node_device_driver.c | 55 +++++++++++++++++++++++++++++++ src/node_device/node_device_linux_sysfs.c | 22 +++++++++++++ src/node_device/node_device_udev.c | 37 +++++++++++++++++---- src/node_device/node_device_udev.h | 18 +++++++--- 4 files changed, 121 insertions(+), 11 deletions(-) -- 1.9.1

3 9

[libvirt] with vhostuser I cannot use hugepages
by Adnan Mundres 25 Jan '18

25 Jan '18

In my setup I am using qemu-kvm without openstack. I am trying to use ovs with dpdk. In my xml file I added following lines for the dpdkvhostuser <cpu mode='host-passthrough'> <numa> <cell id="0" cpus="0-6" memory="16777216" unit='KiB' memAccess="shared"/> </numa> </cpu> I have enabled hugepages during boot time ot@mvmgptb11hyp01 hyp-1]# cat /proc/meminfo | grep -i hugeAnonHugePages: 126976 kBHugePages_Total: 100HugePages_Free: 80HugePages_Rsvd: 0HugePages_Surp: 0Hugepagesize: 1048576 kB But When I start my vm (virsh start vm1.xml) I am seeing that this vm is not using memory from hugepages, rather it is taking memory from total memory. When I checked the log file I see that it is using -object memory-backend-file,id=ram-node0,prealloc=yes,mem-path=/var/lib/libvirt/qemu/ram,share=yes It should use backend memory as following -object memory-backend-file,id=ram-node0,prealloc=yes,mem-path=/dev/hugepages/libvirt/qemu/vm1,share=yes Any idea how can I use memory from hugepages

3 7

[libvirt] [PATCH-RUBY] The first argument passed should be the disk not the size.
by Marius Rieder 25 Jan '18

25 Jan '18

Calling block_resize on a Libvirt::Domain object leads to a TypeError. The reason seems to be that ruby-libvirt tries to convert the size instead of the disk to a string to pass as the disk parameter. --- ext/libvirt/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/libvirt/domain.c b/ext/libvirt/domain.c index 7812450..aff1842 100644 --- a/ext/libvirt/domain.c +++ b/ext/libvirt/domain.c @@ -2882,7 +2882,7 @@ static VALUE libvirt_domain_block_resize(int argc, VALUE *argv, VALUE d) ruby_libvirt_generate_call_nil(virDomainBlockResize, ruby_libvirt_connect_get(d), ruby_libvirt_domain_get(d), - StringValueCStr(size), NUM2ULL(size), + StringValueCStr(disk), NUM2ULL(size), ruby_libvirt_value_to_uint(flags)); } #endif -- 2.7.4

1 0

[libvirt] [PATCH] qemu: get VM's ip address from the output of arp command
by Chen Hanxiao 25 Jan '18

25 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the output of `arp -an` command. We can use: domifaddr f26-cloud --source arp to get the address. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 102 +++++++++++++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 2 + 3 files changed, 105 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf38..38e2d9a3e 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4665,6 +4665,7 @@ typedef virMemoryParameter *virMemoryParameterPtr; typedef enum { VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE = 0, /* Parse DHCP lease file */ VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT = 1, /* Query qemu guest agent */ + VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP = 2, /* Query ARP tables */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LAST diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a203c9297..5aaf69442 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -160,6 +160,9 @@ static int qemuGetDHCPInterfaces(virDomainPtr dom, virDomainObjPtr vm, virDomainInterfacePtr **ifaces); +static int qemuARPGetInterfaces(virDomainObjPtr vm, + virDomainInterfacePtr **ifaces); + static virQEMUDriverPtr qemu_driver; @@ -20384,6 +20387,10 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, break; + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP: + ret = qemuARPGetInterfaces(vm, ifaces); + break; + default: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unknown IP address data source %d"), @@ -20494,6 +20501,101 @@ qemuGetDHCPInterfaces(virDomainPtr dom, } +static int +qemuARPGetInterfaces(virDomainObjPtr vm, + virDomainInterfacePtr **ifaces) +{ + size_t i, j; + size_t ifaces_count = 0; + int ret = -1; + char macaddr[VIR_MAC_STRING_BUFLEN]; + virDomainInterfacePtr *ifaces_ret = NULL; + virDomainInterfacePtr iface = NULL; + virCommandPtr cmd = NULL; + char *outbuf; + char **lines = NULL; + char **matches = NULL; +#define ARP_CMD "/usr/sbin/arp" + + if (!(cmd = virCommandNewArgList(ARP_CMD, + "-an", + NULL))) + goto cleanup; + + virCommandSetOutputBuffer(cmd, &outbuf); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + lines = virStringSplit(outbuf, "\n", 0); + if (lines == NULL) + goto cleanup; + + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + + if (strstr(outbuf, macaddr)) { + for (j = 0; lines[j]; j++) { + const char *line = lines[j]; + if (line == NULL) + break; + if (strstr(line, macaddr) && + virStringSearch(line, "\\b([0-9]{1,3}\\.){3}[0-9]{1,3}\\b", + 1, &matches) == 1) { + + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) + goto error; + + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) + goto error; + + iface = ifaces_ret[ifaces_count - 1]; + iface->naddrs = 1; + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) + goto error; + + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) + goto cleanup; + + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) + goto cleanup; + + if (VIR_STRDUP(iface->addrs->addr, matches[0]) < 0) + goto cleanup; + } + } + } else { + VIR_DEBUG("Got nothing"); + continue; + } + } + + *ifaces = ifaces_ret; + ifaces_ret = NULL; + ret = ifaces_count; + + cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + virStringListFree(lines); + virStringListFree(matches); + cmd = NULL; + return ret; + + error: + if (ifaces_ret) { + for (i = 0; i < ifaces_count; i++) + virDomainInterfaceFree(ifaces_ret[i]); + } + VIR_FREE(ifaces_ret); + + goto cleanup; +} + + static int qemuDomainSetUserPassword(virDomainPtr dom, const char *user, diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 32a42707e..68da11ed5 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2190,6 +2190,8 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE; } else if (STREQ(sourcestr, "agent")) { source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT; + } else if (STREQ(sourcestr, "arp")) { + source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP; } else { vshError(ctl, _("Unknown data source '%s'"), sourcestr); goto cleanup; -- 2.14.3

2 2

[libvirt] [PATCH] libxl: add explicit linkage to xenstore library
by Daniel P. Berrange 24 Jan '18

24 Jan '18

The libxl driver calls a couple of xenstorage APIs, so it must explicitly link to this library rather than rely on indirect linkage via libxl or other xen libraries. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-driver-libxl.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index e6dbfef686..2cc1c062d8 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -75,9 +75,9 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ dnl (since Xen 4.7) if not then assume it is in libxenctrl dnl (as it was for 4.6 and earler) AC_CHECK_LIB([xentoollog], [xtl_createlogger_stdiostream], [ - LIBXL_LIBS="$LIBXL_LIBS -lxentoollog" + LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxentoollog" ],[ - LIBXL_LIBS="$LIBXL_LIBS -lxenctrl" + LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxenctrl" ]) dnl Check if libxl_domain_config_from_json is available for domXML to -- 2.14.3

2 1

[libvirt] [PATCH 0/8] virsh: Introduce more completers
by Michal Privoznik 24 Jan '18

24 Jan '18

It'd be nice if we could autocomplete the basic types like pools, volumes, networks, ... before the release. Michal Privoznik (8): virsh: Introduce virshStoragePoolNameCompleter virsh: Introduce virshStorageVolNameCompleter virsh: Introduce virshInterfaceNameCompleter virsh: Introduce virshNetworkNameCompleter virsh: Introduce virshNodeDeviceNameCompleter virsh: Introduce virshNWFilterNameCompleter virsh: Introduce virshSecretUUIDCompleter virsh: Introduce virshSnapshotNameCompleter tools/virsh-completer.c | 388 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 32 ++++ tools/virsh-interface.c | 16 +- tools/virsh-network.c | 24 +-- tools/virsh-nodedev.c | 16 +- tools/virsh-nwfilter.c | 9 +- tools/virsh-pool.c | 28 ++-- tools/virsh-secret.c | 15 +- tools/virsh-snapshot.c | 21 ++- tools/virsh-volume.c | 45 +++--- tools/virsh.h | 6 +- 11 files changed, 525 insertions(+), 75 deletions(-) -- 2.13.6

2 23

[libvirt] Libvirt fails to apply security context to fd/node to USB device
by Randy Aybar 23 Jan '18

23 Jan '18

Hi, I'm attempting to attach and expose a USB device (WiFi adapter for testing) to an LXC container with SELinux enabled. But when enabling the XML snippet, the container fails to start with this error: 2018-01-12 19:24:31.914+0000: 2181: error : virSecuritySELinuxSetFileconHelper:1182 : unable to set security context 'system_u:object_r:svirt_sandbox_file_t:s0:c139,c284' on '//var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002': No such file or directory Failure in libvirt_lxc startup: unable to set security context 'system_u:object_r:svirt_sandbox_file_t:s0:c139,c284' on '//var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002': No such file or directory The XML snippet for attaching USB device: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x05ac'/> <product id='0x1006'/> </source> <address type='usb' bus='2' port='2'/> </hostdev> SELinux snippet (using the dynamic label for the moment): <seclabel type='dynamic' model='selinux' relabel='yes'/> Running it on CentOS 7.2 and I've tried the distro from the package manager (1.3.3.3), as well as downloaded and compiled the latest stable from libvirt.org (3.10?) and came to the same error each time. Did a small dive into the code after realizing that the path just doesn't seem right. Path (seems to have an unusual and incorrect concatenation of folders) : //var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002 "vroot" seems to be declared by the LXC controller (src/lxc/lxc_controller.c) as such: if (virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name) < 0) goto cleanup; Then upon setting up security for all of the container's attached devices, we call virUSBDeviceNew to setup the attached USB device and give us the path to apply a context to. Since vroot is present, we get this weird path when running through this (src/util/virusb.c): if (virAsprintf(&dev->path, "%s" USB_DEVFS "%03d/%03d", vroot ? vroot : "", dev->bus, dev->dev) < 0) { virUSBDeviceFree(dev); return NULL; } Note: # define USB_DEVFS "/dev/bus/usb/" Should we just be blindly appending this definition if vroot is present, making the path incorrect? If this isn't a bug, I propose the following change: if (virAsprintf(&dev->path, "%s" "%03d/%03d", vroot ? vroot : USB_DEVFS, dev->bus, dev->dev) < 0) { virUSBDeviceFree(dev); return NULL; } Would kindly appreciate any feedback on whether this is a bug or maybe I'm missing something and is the reason why it's written this way. Thanks, Randy

2 2

[libvirt] [PATCH 0/9] Yet another version of CAT stuff (no idea about the version number)
by Martin Kletzander 23 Jan '18

23 Jan '18

Added stuff that Pavel wanted, removed some testcases that I still have in my repo, but it's way to complicated to add properly, so for now I would just go with this and manual testing of starting some domains. I got no hardware to test this on, currently, so some testing is needed before pushing this. @Eli: Can you help with the testing? Martin Kletzander (9): Rename virResctrlInfo to virResctrlInfoPerCache util: Add virResctrlInfo conf: Use virResctrlInfo in capabilities util: Remove now-unneeded resctrl functions resctrl: Add functions to work with resctrl allocations conf: Add support for cputune/cachetune tests: Add virresctrltest qemu: Add support for resctrl docs: Add CAT (resctrl) support into news.xml docs/formatdomain.html.in | 54 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 32 + po/POTFILES.in | 1 + src/Makefile.am | 2 +- src/conf/capabilities.c | 55 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 251 ++++ src/conf/domain_conf.h | 13 + src/libvirt_private.syms | 16 +- src/qemu/qemu_process.c | 61 +- src/util/virresctrl.c | 1380 ++++++++++++++++++-- src/util/virresctrl.h | 86 +- src/util/virresctrlpriv.h | 27 + tests/Makefile.am | 8 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 36 + .../cachetune-colliding-allocs.xml | 30 + .../cachetune-colliding-tunes.xml | 32 + .../cachetune-colliding-types.xml | 30 + tests/genericxml2xmlindata/cachetune-small.xml | 29 + tests/genericxml2xmlindata/cachetune.xml | 33 + tests/genericxml2xmltest.c | 10 + tests/virresctrldata/resctrl-cdp.schemata | 2 + .../virresctrldata/resctrl-skx-twocaches.schemata | 1 + tests/virresctrldata/resctrl-skx.schemata | 1 + tests/virresctrldata/resctrl.schemata | 1 + tests/virresctrltest.c | 102 ++ 27 files changed, 2174 insertions(+), 132 deletions(-) create mode 100644 src/util/virresctrlpriv.h create mode 100644 tests/genericxml2xmlindata/cachetune-cdp.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-tunes.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-types.xml create mode 100644 tests/genericxml2xmlindata/cachetune-small.xml create mode 100644 tests/genericxml2xmlindata/cachetune.xml create mode 100644 tests/virresctrldata/resctrl-cdp.schemata create mode 100644 tests/virresctrldata/resctrl-skx-twocaches.schemata create mode 100644 tests/virresctrldata/resctrl-skx.schemata create mode 100644 tests/virresctrldata/resctrl.schemata create mode 100644 tests/virresctrltest.c -- 2.15.1

6 31

[libvirt] [dbus PATCH v2] main: add support for all usable libvirt drivers
by Pavel Hrdina 23 Jan '18

23 Jan '18

Some of the drivers are remote only, such as ESX, GSX, VPX, PHyp and HyperV. Currently we support only local drivers. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/main.c | 21 +++++++++++++++++---- test/libvirttest.py | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index ab03bc1..32c1cc4 100644 --- a/src/main.c +++ b/src/main.c @@ -85,13 +85,26 @@ struct virtDBusDriver { }; static const struct virtDBusDriver sessionDrivers[] = { - { "qemu:///session", "/org/libvirt/qemu" }, - { "test:///default", "/org/libvirt/test" }, + { "qemu:///session", "/org/libvirt/QEMU" }, + { "test:///default", "/org/libvirt/Test" }, + { "uml:///session", "/org/libvirt/UML" }, + { "vbox:///session", "/org/libvirt/VBox" }, + { "vmwarefusion:///session", "/org/libvirt/VMwareFusion" }, + { "vmwareplayer:///session", "/org/libvirt/VMwarePlayer" }, + { "vmwarews:///session", "/org/libvirt/VMwareWS" }, }; static const struct virtDBusDriver systemDrivers[] = { - { "qemu:///system", "/org/libvirt/qemu" }, - { "test:///default", "/org/libvirt/test" }, + { "XenApi://localhost/", "/org/libvirt/XenAPI" }, + { "bhyve:///system", "/org/libvirt/BHyve" }, + { "lxc:///", "/org/libvirt/LXC" }, + { "openvz:///system", "/org/libvirt/OpenVZ" }, + { "qemu:///system", "/org/libvirt/QEMU" }, + { "test:///default", "/org/libvirt/Test" }, + { "uml:///system", "/org/libvirt/UML" }, + { "vbox:///system", "/org/libvirt/VBox" }, + { "vz:///system", "/org/libvirt/VZ" }, + { "xen:///", "/org/libvirt/Xen" }, }; int diff --git a/test/libvirttest.py b/test/libvirttest.py index 579485f..6a00aea 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -38,7 +38,7 @@ class TestCase(unittest.TestCase): else: raise TimeoutError('error starting libvirt-dbus') - obj = self.bus.get_object('org.libvirt', '/org/libvirt/test') + obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') self.connect = dbus.Interface(obj, 'org.libvirt.Connect') def tearDown(self): -- 2.14.3

2 1

[libvirt] [dbus RFC 00/11] improve libvirt connections handling
by Pavel Hrdina 23 Jan '18

23 Jan '18

This patch series is a proposal to how to implement libvirt connections in the libvirt D-Bus binding. The design is based on a discussion with Daniel and it should follow D-Bus convention. Each connection is represented as existing object where the object path contains the driver name: /org/libvirt/qemu and there is no need to call any connect API but simply use the existing object directly to operate with that connection. This patch series also implements strict difference between system and user bus. On the user bus only drivers with session capability are available and on the system bus only drivers with system capability are available. Pavel Hrdina (11): util: introduce VIRT_ARRAY_CARDINALITY macro util: introduce virtDBusUtilSetError helper src: rename manager to connect connect: implement lazy connection connect: don't use default libvirt authentication callback connect: implement reconnect functionality to libvirt connect: move domain related code to domain.c connect: store connect path in connect structure domain: derive domain path from connect path main: implement multiple connection within one daemon main: add support for all libvirt drivers src/Makefile.am | 2 +- src/connect.c | 308 ++++++++++++++++++++++++++++++ src/connect.h | 27 +++ src/domain.c | 131 ++++++++----- src/domain.h | 4 +- src/events.c | 64 +++---- src/events.h | 4 +- src/main.c | 75 ++++++-- src/manager.c | 216 --------------------- src/manager.h | 20 -- src/util.c | 17 +- src/util.h | 12 +- test/Makefile.am | 2 +- test/libvirttest.py | 6 +- test/{test_manager.py => test_connect.py} | 12 +- test/test_domain.py | 6 +- 16 files changed, 543 insertions(+), 363 deletions(-) create mode 100644 src/connect.c create mode 100644 src/connect.h delete mode 100644 src/manager.c delete mode 100644 src/manager.h rename test/{test_manager.py => test_connect.py} (79%) -- 2.14.3

2 28

[libvirt] [PATCH] docs: formatdomain: Document the CPU feature 'name' attribute
by Kashyap Chamarthy 23 Jan '18

23 Jan '18

Currently, the CPU feature 'name' XML attribute, as in: [...] <cpu match='exact'> <model fallback='forbid'>IvyBridge</model> <vendor>Intel</vendor> <feature policy='require' name='pcid'/> </cpu> [...] isn't explicitly documented in formatdomain.html. Document it now. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/formatdomain.html.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d272cc1ba..e717fb3aa 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1454,6 +1454,23 @@ Since 0.8.5 the <code>policy</code> attribute can be omitted and will default to <code>require</code>. + + Individual CPU feature names can be specified as part of the + <code>name</code> attribute. The list of known CPU feature + names (e.g. 'vmx', 'cmt', et cetera) can be found in the same + file as CPU models -- <code>cpu_map.xml</code>. For example, + to explicitly specify the 'pcid' feature with Intel IvyBridge + CPU model: + +<pre> +... +<cpu match='exact'> + <model fallback='forbid'>IvyBridge</model> + <vendor>Intel</vendor> + <feature policy='require' name='pcid'/> +</cpu> +...</pre> + </dd> <dt><code>cache</code></dt> -- 2.13.6

2 4

[libvirt] a libvirt event question
by Chen, Xiaogang 22 Jan '18

22 Jan '18

Hello: We are adding libvirt functions to launch SEV VM. When start VM I put it at "pause" state. During that time qemu sends an event "sev_measurement". We hope libvirtd get this event before we resume VM. But I did not see libvirtd receive it. If I send this event at qemu during resume time libvirtd can get this event successfully. I traced qemuMonitorJSONIOProcessEvent function for events received, did not see any event coming before resume VM. Is there something I missed to get this event during pause state? Thank you for your help. Regards Xiaogang

1 1

[libvirt] [PATCH v3] libvirtd: clarify the TLS conf default value setting
by Chen Hanxiao 22 Jan '18

22 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Provide more details related to the requirement that setting one of the values requires setting all of them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v3: description updated follow John's comments v2: fix a typo daemon/libvirtd.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8e0c0d96d..91b3f47de 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -182,6 +182,20 @@ # TLS x509 certificate configuration # +# Use of TLS requires that x509 certificates be issued. The default locations +# for the certificate files is as follows: +# +# /etc/pki/CA/cacert.pem - The CA master certificate +# /etc/pki/libvirt/servercert.pem - The server certificate signed with +# the cacert.pem +# /etc/pki/libvirt/private/serverkey.pem - The server private key +# +# It is possible to override the default locations by altering the 'key_file', +# 'cert_file', and 'ca_file' values and uncommenting them below. +# +# NB, overriding the default of one location requires uncommenting and +# possibly additionally overriding the other settings. +# # Override the default server key file path # -- 2.14.3

2 1

[libvirt] [PATCH] libvirtd: Explicit dependency on systemd-machined
by Michal Koutný 22 Jan '18

22 Jan '18

The libvirtd daemon uses systemd-machined D-Bus API when manipulating domains. The systemd-machined is D-Bus activated on demand. However, during system shutdown systemd-machined is stopped concurrently with libvirtd and virsh users also doing their final cleanup may transitively fail due to unavailability of systemd-machined. Example error message > libvirtd[1390]: 2017-12-20 18:55:56.182+0000: 32700: error : virSystemdTerminateMachine:503 : Refusing activation, D-Bus is shutting down. To circumvent this we need to explicitly specify both ordering and requirement dependency (to avoid late D-Bus activation) on systemd-machined. See [1] for the dependency debate. [1] https://lists.freedesktop.org/archives/systemd-devel/2018-January/040095.ht… --- The Wants= dependency is for the case when systemd-machined wasn't started neither D-Bus activated anytime before the shutdown transaction. AFAICS this is very unlikely so for the sake of lazy activation, the Wants= hunk can be dropped. daemon/libvirtd.service.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index c189f5e65..769702ea7 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -7,6 +7,7 @@ Description=Virtualization daemon Requires=virtlogd.socket Requires=virtlockd.socket +Wants=systemd-machined.service Before=libvirt-guests.service After=network.target After=dbus.service @@ -14,6 +15,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target After=remote-fs.target +After=systemd-machined.service Documentation=man:libvirtd(8) Documentation=https://libvirt.org -- 2.13.6

3 4

[libvirt] [PATCH 0/4] Add admin protocol support for virtlogd/virtlockd
by Daniel P. Berrange 22 Jan '18

22 Jan '18

The initial admin protocol support was only integrated into libvirtd. This series extracts that code so that it is reusable with all the daemons we have (and more than we'll get). Daniel P. Berrange (4): admin: move admins server impl/dispatch into src/admin directory util: add virGetUNIXSocketPath helper logd: add support for admin protocol in virtlogd lockd: add support for admin protocol in virtlockd .gitignore | 1 + cfg.mk | 3 +- daemon/Makefile.am | 33 +---- daemon/libvirtd.c | 2 +- daemon/libvirtd.h | 10 -- po/POTFILES.in | 4 +- src/Makefile.am | 33 ++++- {daemon => src/admin}/admin_server.c | 4 +- {daemon => src/admin}/admin_server.h | 6 +- .../admin.c => src/admin/admin_server_dispatch.c | 21 ++-- .../admin.h => src/admin/admin_server_dispatch.h | 9 +- src/libvirt-admin.c | 23 +++- src/locking/lock_daemon.c | 132 +++++++++++++++----- src/locking/lock_daemon_config.c | 3 + src/locking/lock_daemon_config.h | 1 + src/locking/test_virtlockd.aug.in | 4 + src/locking/virtlockd-admin.socket.in | 10 ++ src/locking/virtlockd.aug | 1 + src/locking/virtlockd.conf | 6 + src/locking/virtlockd.service.in | 1 + src/logging/log_daemon.c | 135 +++++++++++++++------ src/logging/log_daemon_config.c | 3 + src/logging/log_daemon_config.h | 1 + src/logging/test_virtlogd.aug.in | 4 + src/logging/virtlogd-admin.socket.in | 10 ++ src/logging/virtlogd.aug | 1 + src/logging/virtlogd.service.in | 1 + src/util/virutil.c | 45 +++++++ src/util/virutil.h | 1 + 29 files changed, 371 insertions(+), 137 deletions(-) rename {daemon => src/admin}/admin_server.c (99%) rename {daemon => src/admin}/admin_server.h (96%) rename daemon/admin.c => src/admin/admin_server_dispatch.c (96%) rename daemon/admin.h => src/admin/admin_server_dispatch.h (83%) create mode 100644 src/locking/virtlockd-admin.socket.in create mode 100644 src/logging/virtlogd-admin.socket.in -- 2.14.3

2 11

[libvirt] [PATCH] qemu: Don't initialize struct utsname
by Jiri Denemark 22 Jan '18

22 Jan '18

It breaks the build and it is not really useful for anything. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed under the build breaker rule. src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c573827f1..5e03447baa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5431,7 +5431,7 @@ virQEMUCapsCacheNew(const char *libDir, char *capsCacheDir = NULL; virFileCachePtr cache = NULL; virQEMUCapsCachePrivPtr priv = NULL; - struct utsname uts = { 0 }; + struct utsname uts; if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0) goto error; -- 2.16.0

2 3

[libvirt] [PATCH] Raise the frame limit for tests
by Ján Tomko 22 Jan '18

22 Jan '18

After the latest CPU additions, the build fails with clang: cputest.c:905:1: error: stack frame size of 26136 bytes in function 'mymain' [-Werror,-Wframe-larger-than=] Raise the relaxed limit which is used for tests. --- m4/virt-compile-warnings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as a build breaker fix diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index f18a08a8f..b9c974842 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -200,7 +200,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # but using 1024 bytes sized buffers (mostly for virStrerror) # stops us from going down further gl_WARN_ADD([-Wframe-larger-than=4096], [STRICT_FRAME_LIMIT_CFLAGS]) - gl_WARN_ADD([-Wframe-larger-than=25600], [RELAXED_FRAME_LIMIT_CFLAGS]) + gl_WARN_ADD([-Wframe-larger-than=32768], [RELAXED_FRAME_LIMIT_CFLAGS]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 2.13.6

4 10