- Devel - libvirt List Archives

[libvirt] [dbus PATCH] connect: fix deregistering of NodeDevice events
by Anya Harter 25 Jun '18

25 Jun '18

Signed-off-by: Anya Harter <aharter(a)redhat.com> --- src/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connect.c b/src/connect.c index 09e5628..32dda14 100644 --- a/src/connect.c +++ b/src/connect.c @@ -68,7 +68,7 @@ virtDBusConnectClose(virtDBusConnect *connect, for (gint i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { if (connect->nodeDevCallbackIds[i] >= 0) { if (deregisterEvents) { - virConnectNetworkEventDeregisterAny(connect->connection, + virConnectNodeDeviceEventDeregisterAny(connect->connection, connect->nodeDevCallbackIds[i]); } connect->nodeDevCallbackIds[i] = -1; -- 2.17.1

2 1

[libvirt] [PATCH] qemu: format serial, geometry and error policy on frontend disk device
by Daniel P. Berrangé 25 Jun '18

25 Jun '18

Currently we format the serial, geometry and error policy on the -drive backend argument. QEMU added the ability to set serial and geometry on the frontend in the 1.2 release, and ability to set error policy in the 2.7 release. usb-storage is an oddity, however, as it lacks error policy support right now. Setting any of these on -drive has been deprecated and support for this will be removed very soon. Note that some disk buses (sd) still don't support -device. Although QEMU allowed these properties to be set on -drive for if=sd, they have been ignored so we don't loose anything by removing this. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 31 ++++++++++++++++--- .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../disk-drive-network-tlsx509.args | 12 +++---- .../disk-drive-network-vxhs.args | 4 +-- tests/qemuxml2argvdata/disk-drive-shared.args | 5 +-- tests/qemuxml2argvdata/disk-geometry.args | 6 ++-- tests/qemuxml2argvdata/disk-ide-wwn.args | 5 ++- .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 4 +-- tests/qemuxml2argvdata/disk-serial.args | 10 +++--- tests/qemuxml2argvdata/disk-serial.xml | 1 - tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-serial.xml | 1 - 29 files changed, 69 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 419208ad5c..b9a6c2d612 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -500,6 +500,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 310 */ "sev-guest", + "disk-error", ); @@ -1162,6 +1163,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, + { "werror", QEMU_CAPS_DISK_ERROR }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3519a194e9..1245fb46cf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -484,6 +484,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 310 */ QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */ + QEMU_CAPS_DISK_ERROR, /* -device $DISK,werror=,rerror=X */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 446df3e1d8..e97158fe64 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1621,8 +1621,6 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virBufferAddLit(buf, ",serial="); virBufferEscape(buf, '\\', " ", "%s", disk->serial); } - - qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf); } @@ -1662,11 +1660,29 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, "if=%s", virDomainDiskQEMUBusTypeToString(disk->bus)); virBufferAsprintf(&opt, ",index=%d", idx); + + if (disk->serial) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Serial property not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Geometry not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } } - /* Format attributes for the drive itself (not the storage backing it) which - * we've formatted historically with -drive */ - qemuBuildDiskFrontendAttributes(disk, &opt); + /* werror/rerror are really frontend attributes, but older + * qemu requires them on -drive instead of -device */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_ERROR) || + disk->bus == VIR_DOMAIN_DISK_BUS_USB) + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. @@ -2125,6 +2141,11 @@ qemuBuildDriveDevStr(const virDomainDef *def, if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) goto error; + qemuBuildDiskFrontendAttributes(disk, &opt); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_ERROR) && + disk->bus != VIR_DOMAIN_DISK_BUS_USB) + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 169641063c..35893bdac4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -159,6 +159,7 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>307647</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 92c095abd2..0c7249a24b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -158,6 +158,7 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>386992</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 5e22e21224..7576c59cb0 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -119,6 +119,7 @@ <flag name='sdl-gl'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>307899</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 10b066bff1..2cc10e2192 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -203,6 +203,7 @@ <flag name='vmgenid'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>367995</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 6ca2e57ef8..58ec9f4e02 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -126,6 +126,7 @@ <flag name='blockdev-del'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>346751</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 5ed0290397..3073ea10f5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -169,6 +169,7 @@ <flag name='vhost-vsock'/> <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>347313</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index c61029e479..acd6a8d8c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -166,6 +166,7 @@ <flag name='vhost-vsock'/> <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>424244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 6fac6d6906..7aa7e8d889 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -133,6 +133,7 @@ <flag name='vhost-vsock'/> <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> + <flag name='disk-error'/> <version>2012000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>375762</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 2167f06976..92871de23f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -211,6 +211,7 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='sev-guest'/> + <flag name='disk-error'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>415959</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 9ed25178f8..ce1752934c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -107,6 +107,7 @@ <flag name='nbd-tls'/> <flag name='virtual-css-bridge'/> <flag name='sdl-gl'/> + <flag name='disk-error'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>220792</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 959a858349..3be3b383ec 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -180,6 +180,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>244005</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 646239ff25..1cecf68b23 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -110,6 +110,7 @@ <flag name='virtual-css-bridge'/> <flag name='sdl-gl'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2007093</version> <kvmVersion>0</kvmVersion> <microcodeVersion>246206</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 3af44f0904..6ed95782ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -183,6 +183,7 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>260660</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 70a5936439..1ee5079ee8 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -150,6 +150,7 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>350708</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 09d68e1f18..a25f49f375 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -114,6 +114,7 @@ <flag name='sdl-gl'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> + <flag name='disk-error'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>269625</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 31ce52c787..0627d42bf3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -198,6 +198,7 @@ <flag name='vmgenid'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='disk-error'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>343984</microcodeVersion> diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args index e25f45742c..b5e73064c0 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args @@ -28,22 +28,22 @@ server,nowait \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ ,path,endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk1,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ +id=virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk2,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ +id=virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ path,endpoint=client,verify-peer=yes \ -drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args index c2a1d4681f..fad4dfd942 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args @@ -25,6 +25,6 @@ server,nowait \ -usb \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2argvdata/disk-drive-shared.args index 5306fdf750..032e86e291 100644 --- a/tests/qemuxml2argvdata/disk-drive-shared.args +++ b/tests/qemuxml2argvdata/disk-drive-shared.args @@ -23,8 +23,9 @@ server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -serial=XYZXYZXYZYXXYZYZYXYZY,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ +serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index b173ab6407..db0c7fb561 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cyls=16383,heads=16,secs=63,trans=lba \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,cyls=16383,\ +heads=16,secs=63,trans=lba \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index e6d2758ec3..a0e3f06b68 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=WD-WMAP9A966149 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ -wwn=0x5000c50015ea71ad \ +wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 29607e8927..6407fd002d 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -25,9 +25,9 @@ server,nowait \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\ -serial=WD-WMAP9A966149,readonly=on \ +readonly=on \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ -id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ +id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \ diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index 88310b009f..5892f64c29 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -22,11 +22,11 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ +-device 'ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ serial=\ \ WD-WMAP9A966149' \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive 'file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2,\ +-drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \ +-device 'ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ --drive file=/some/file,format=raw,if=sd,index=0,serial=sdserial \ +-drive file=/some/file,format=raw,if=sd,index=0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml index ea71f2c339..18e72bb4ba 100644 --- a/tests/qemuxml2argvdata/disk-serial.xml +++ b/tests/qemuxml2argvdata/disk-serial.xml @@ -29,7 +29,6 @@ <disk type='file' device='disk'> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 582a9de7bb..06b94be625 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1038,6 +1038,7 @@ mymain(void) DO_TEST("disk-drive-error-policy-stop", NONE); DO_TEST("disk-drive-error-policy-enospace", NONE); DO_TEST("disk-drive-error-policy-wreport-rignore", NONE); + DO_TEST("disk-drive-error-policy-front", QEMU_CAPS_DISK_ERROR); DO_TEST("disk-drive-cache-v2-wt", NONE); DO_TEST("disk-drive-cache-v2-wb", NONE); DO_TEST("disk-drive-cache-v2-none", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index 9313c699b6..a803cd959c 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -32,7 +32,6 @@ <driver name='qemu' type='raw'/> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> -- 2.17.1

2 3

[libvirt] [PATCH] formatdomain.html.in: Amend the 'random' RNG backend section
by Kashyap Chamarthy 25 Jun '18

25 Jun '18

Since libvirt 1.3.4, any RNG source is accepted for the 'random' backend. However, '/dev/urandom' is the _recommended_ source of entropy. Mention it so in the docs. Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/formatdomain.html.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 89672a0486..3dd6a59a01 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7738,12 +7738,16 @@ qemu-kvm -net nic,model=? /dev/null <dt><code>random</code></dt> <dd> <p> - This backend type expects a non-blocking character device as - input. The file name is specified as contents of the - <code>backend</code> element. <span class='since'>Since 1.3.4</span> - any path is accepted. Before that /dev/random and /dev/hwrng were - the only accepted paths. When no file name is specified the hypervisor - default is used. For qemu, the default is /dev/random + This backend type expects a non-blocking character device + as input. The file name is specified as contents of the + <code>backend</code> element. <span class='since'>Since + 1.3.4</span> any path is accepted. Before that + <code>/dev/random</code> and <code>/dev/hwrng</code> were + the only accepted paths. When no file name is specified, + the hypervisor default is used. For QEMU, the default is + <code>/dev/random</code>. However, the recommended source + of entropy is <code>/dev/urandom</code> (as it doesn't + have the limitations of <code>/dev/random</code>). </p> </dd> <dt><code>egd</code></dt> -- 2.17.0

2 3

[libvirt] [PATCH 0/2] qemu: Improve error/debug messages if unable to acquire a job
by Michal Privoznik 25 Jun '18

25 Jun '18

*** BLURB HERE *** Michal Privoznik (2): qemuDomainObjBeginJobInternal: Log agent job too qemuDomainObjBeginJobInternal: Report agent job in error message src/qemu/qemu_domain.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) -- 2.16.4

3 5

[libvirt] [PATCH] qemu: ensure FDs passed to QEMU for chardevs have correct SELinux labels
by Daniel P. Berrangé 25 Jun '18

25 Jun '18

The UNIX socket FDs were we passing to QEMU inherited a label based on libvirtd's context. QEMU is thus denied ability to access the UNIX socket. We need to use the security manager to change our current context temporarily when creating the UNIX socket FD. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 86 ++++++++++++++++++++++++++++------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_process.c | 2 + 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ffcb5b1ae..146f671663 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4931,6 +4931,7 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) * host side of the character device */ static char * qemuBuildChrChardevStr(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -5065,7 +5066,13 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, case VIR_DOMAIN_CHR_TYPE_UNIX: if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { + if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)def) < 0) + goto cleanup; int fd = qemuOpenChrChardevUNIXSocket(dev); + if (qemuSecurityClearSocketLabel(secManager, (virDomainDefPtr)def) < 0) { + VIR_FORCE_CLOSE(fd); + goto cleanup; + } if (fd < 0) goto cleanup; @@ -5404,6 +5411,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, static int qemuBuildMonitorCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, virDomainDefPtr def, @@ -5414,7 +5422,8 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager, if (!priv->monConfig) return 0; - if (!(chrdev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(chrdev = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, priv->monConfig, "monitor", priv->qemuCaps, true, priv->chardevStdioLogd))) @@ -5533,6 +5542,7 @@ qemuBuildSclpDevStr(virDomainChrDefPtr dev) static int qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -5550,7 +5560,8 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager, return 0; case VIR_DOMAIN_RNG_BACKEND_EGD: - if (!(*chr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(*chr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, rng->source.chardev, rng->info.alias, qemuCaps, true, chardevStdioLogd))) @@ -5680,6 +5691,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, static int qemuBuildRNGCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -5702,7 +5714,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, } /* possibly add character device for backend */ - if (qemuBuildRNGBackendChrdevStr(logManager, cmd, cfg, def, + if (qemuBuildRNGBackendChrdevStr(logManager, secManager, cmd, cfg, def, rng, qemuCaps, &tmp, chardevStdioLogd) < 0) return -1; @@ -8135,6 +8147,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, static int qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virDomainDefPtr def, virDomainNetDefPtr net, @@ -8157,7 +8170,8 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: - if (!(chardev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(chardev = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, net->data.vhostuser, net->info.alias, qemuCaps, false, chardevStdioLogd))) @@ -8225,6 +8239,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, static int qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virDomainDefPtr def, virDomainNetDefPtr net, @@ -8356,7 +8371,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - ret = qemuBuildVhostuserCommandLine(driver, logManager, cmd, def, + ret = qemuBuildVhostuserCommandLine(driver, logManager, secManager, cmd, def, net, qemuCaps, bootindex, chardevStdioLogd); goto cleanup; @@ -8534,6 +8549,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, static int qemuBuildNetCommandLine(virQEMUDriverPtr driver, virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virDomainDefPtr def, virQEMUCapsPtr qemuCaps, @@ -8566,7 +8582,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver, for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; - if (qemuBuildInterfaceCommandLine(driver, logManager, cmd, def, net, + if (qemuBuildInterfaceCommandLine(driver, logManager, secManager, cmd, def, net, qemuCaps, bootNet, vmop, standalone, nnicindexes, nicindexes, @@ -8629,6 +8645,7 @@ qemuBuildSmartcardFindCCIDController(const virDomainDef *def, static int qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -8702,7 +8719,8 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, return -1; } - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, smartcard->data.passthru, smartcard->info.alias, qemuCaps, true, @@ -8862,6 +8880,7 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) static int qemuBuildShmemCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, virDomainDefPtr def, @@ -8933,7 +8952,8 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, VIR_FREE(devstr); if (shmem->server.enabled) { - devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, &shmem->server.chr, shmem->info.alias, qemuCaps, true, chardevStdioLogd); @@ -9020,6 +9040,7 @@ qemuChrIsPlatformDevice(const virDomainDef *def, static int qemuBuildSerialCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -9043,7 +9064,8 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager, if (serial->source->type == VIR_DOMAIN_CHR_TYPE_SPICEPORT && !havespice) continue; - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, serial->source, serial->info.alias, qemuCaps, true, @@ -9080,6 +9102,7 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager, static int qemuBuildParallelsCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -9092,7 +9115,8 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager, virDomainChrDefPtr parallel = def->parallels[i]; char *devstr; - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, parallel->source, parallel->info.alias, qemuCaps, true, @@ -9113,6 +9137,7 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager, static int qemuBuildChannelsCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -9127,7 +9152,8 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, switch (channel->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, channel->source, channel->info.alias, qemuCaps, true, @@ -9144,7 +9170,8 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, channel->source, channel->info.alias, qemuCaps, true, @@ -9166,6 +9193,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, static int qemuBuildConsoleCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -9187,7 +9215,8 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager, return -1; } - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, console->source, console->info.alias, qemuCaps, true, @@ -9208,7 +9237,8 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager, return -1; } - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, console->source, console->info.alias, qemuCaps, true, @@ -9223,7 +9253,8 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, console->source, console->info.alias, qemuCaps, true, @@ -9342,6 +9373,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, static int qemuBuildRedirdevCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -9354,7 +9386,8 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager, virDomainRedirdevDefPtr redirdev = def->redirdevs[i]; char *devstr; - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, redirdev->source, redirdev->info.alias, qemuCaps, true, @@ -10065,6 +10098,7 @@ qemuBuildVsockCommandLine(virCommandPtr cmd, virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver, virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virDomainObjPtr vm, const char *migrateURI, virDomainSnapshotObjPtr snapshot, @@ -10181,7 +10215,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildMonitorCommandLine(logManager, cmd, cfg, def, priv) < 0) + if (qemuBuildMonitorCommandLine(logManager, secManager, cmd, cfg, def, priv) < 0) goto error; if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) @@ -10211,29 +10245,29 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildFSDevCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildNetCommandLine(driver, logManager, cmd, def, + if (qemuBuildNetCommandLine(driver, logManager, secManager, cmd, def, qemuCaps, vmop, standalone, nnicindexes, nicindexes, &bootHostdevNet, chardevStdioLogd) < 0) goto error; - if (qemuBuildSmartcardCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; - if (qemuBuildSerialCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildSerialCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; - if (qemuBuildParallelsCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildParallelsCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; - if (qemuBuildChannelsCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildChannelsCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; - if (qemuBuildConsoleCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildConsoleCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; @@ -10258,7 +10292,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildWatchdogCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildRedirdevCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildRedirdevCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; @@ -10271,7 +10305,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildMemballoonCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildRNGCommandLine(logManager, cmd, cfg, def, qemuCaps, + if (qemuBuildRNGCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps, chardevStdioLogd) < 0) goto error; @@ -10306,7 +10340,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, goto error; for (i = 0; i < def->nshmems; i++) { - if (qemuBuildShmemCommandLine(logManager, cmd, cfg, + if (qemuBuildShmemCommandLine(logManager, secManager, cmd, cfg, def, def->shmems[i], qemuCaps, chardevStdioLogd)) goto error; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index c78282eb09..4f1b360130 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -46,6 +46,7 @@ VIR_ENUM_DECL(qemuVideo) virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver, virLogManagerPtr logManager, + virSecurityManagerPtr secManager, virDomainObjPtr vm, const char *migrateURI, virDomainSnapshotObjPtr snapshot, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2967568f62..7e9ad01e61 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6174,6 +6174,7 @@ qemuProcessLaunch(virConnectPtr conn, VIR_DEBUG("Building emulator command line"); if (!(cmd = qemuBuildCommandLine(driver, qemuDomainLogContextGetManager(logCtxt), + driver->securityManager, vm, incoming ? incoming->launchURI : NULL, snapshot, vmop, @@ -6642,6 +6643,7 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, VIR_DEBUG("Building emulator command line"); cmd = qemuBuildCommandLine(driver, NULL, + driver->securityManager, vm, migrateURI, NULL, -- 2.17.1

2 1

[libvirt] [PATCH] docs: formatdomain: Note the caveats for CPU policy option "force"
by Kashyap Chamarthy 22 Jun '18

22 Jun '18

Eduardo Habkost has pointed out that the current documentation of libvirt's CPU feature policy "require" vs. "force" does not match QEMU's behaviour. Update the documentation by spelling out the QEMU version dependency and explain in which scenarios the usage of "policy = 'force'" is applicable or not. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- Wordsmithing / corrections welcome. --- docs/formatdomain.html.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6912762f28..4d6c3892ee 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1566,8 +1566,17 @@ <dl> <dt><code>force</code></dt> - <dd>The virtual CPU will claim the feature is supported regardless - of it being supported by host CPU.</dd> + <dd>The virtual CPU will claim the feature is supported + regardless of it being supported by host CPU -- this is only + true for QEMU version older than 2.9.0. I.e. when using the + CPU mode 'host-model', libvirt identifies which CPU features + to use by looking at host CPUID. For that to take effect, it + is mandatory to use <code>force</code> to tell libvirt that a + said CPU feature must be used despite it not existing in the + host -- this applicable only for a very limited set of CPU + features, such as 'x2apic', virt-ssbd' (for AMD CPUs).</dd> + <dd>However, when using QEMU 2.9.0 and above, there should + never be any need to use <code>force</code>.</dd> <dt><code>require</code></dt> <dd>Guest creation will fail unless the feature is supported by the host CPU or the hypervisor is able to emulate it.</dd> -- 2.17.0

3 3

[libvirt] [PATCH v3 00/20] nwfilter: refactor the driver to make it independent of virt drivers
by Daniel P. Berrangé 22 Jun '18

22 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-April/msg02616.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01145.html Today the nwfilter driver is entangled with the virt drivers in both directions. At various times when rebuilding filters nwfilter will call out to the virt driver to iterate over running guest's NICs. This has caused very complicated lock ordering rules to be required. If we are to split the virt drivers out into separate daemons we need to get rid of this coupling since we don't want the separate daemons calling each other, as that risks deadlock if all of the RPC workers are busy. The obvious way to solve this is to have the nwfilter driver remember all the filters it has active, avoiding the need to iterate over running guests. Still todo - Document the new XML format Changed in v3: - Updated API version numbers - Use accessors for virNWFilterBindingObjPtr struct - Other fixes John mentioned Changed in v2: - The virNWFilterBindingPtr was renamed virNWFilterBindingDefPtr - New virNWFilterBindingObjPtr & virNWFilterBindingObjListPtr structs added to track the objects in the driver - New virNWFilterBindingPtr public API type was added - New public APIs for listing filter bindings, querying XML, and creating/deleting them - Convert the virt drivers to use the public API for creating and deleting bindings - Persistent active bindings out to disk so they're preserved across restarts - Added RNG schema and XML-2-XML test - New virsh commands for listing/querying XML/creating/deleting bindings Daniel P. Berrangé (20): conf: change virNWFilterBindingPtr to virNWFilterBindingDefPtr conf: add missing virxml.h include for nwfilter_params.h conf: move virNWFilterBindingDefPtr into its own files conf: add support for parsing/formatting virNWFilterBindingDefPtr schemas: add schema for nwfilter binding XML document nwfilter: export port binding concept in the public API access: add nwfilter binding object permissions remote: add support for nwfilter binding objects virsh: add nwfilter binding commands nwfilter: convert the gentech driver code to use virNWFilterBindingDefPtr nwfilter: convert IP address learning code to virNWFilterBindingDefPtr nwfilter: convert DHCP address snooping code to virNWFilterBindingDefPtr conf: report an error if nic needs filtering by no driver is present conf: introduce a virNWFilterBindingObjPtr struct conf: introduce a virNWFilterBindingObjListPtr struct nwfilter: keep track of active filter bindings nwfilter: remove virt driver callback layer for rebuilding filters nwfilter: wire up new APIs for listing and querying filter bindings nwfilter: wire up new APIs for creating and deleting nwfilter bindings nwfilter: convert virt drivers to use public API for nwfilter bindings docs/schemas/domaincommon.rng | 27 +- docs/schemas/nwfilter.rng | 29 +- docs/schemas/nwfilter_params.rng | 32 ++ docs/schemas/nwfilterbinding.rng | 49 ++ include/libvirt/libvirt-nwfilter.h | 39 ++ include/libvirt/virterror.h | 2 + src/access/viraccessdriver.h | 5 + src/access/viraccessdrivernop.c | 10 + src/access/viraccessdriverpolkit.c | 21 + src/access/viraccessdriverstack.c | 24 + src/access/viraccessmanager.c | 15 + src/access/viraccessmanager.h | 5 + src/access/viraccessperm.c | 7 +- src/access/viraccessperm.h | 38 ++ src/conf/Makefile.inc.am | 6 + src/conf/domain_nwfilter.c | 125 ++++- src/conf/domain_nwfilter.h | 13 - src/conf/nwfilter_conf.c | 188 +------ src/conf/nwfilter_conf.h | 68 +-- src/conf/nwfilter_params.h | 1 + src/conf/virnwfilterbindingdef.c | 280 ++++++++++ src/conf/virnwfilterbindingdef.h | 65 +++ src/conf/virnwfilterbindingobj.c | 299 +++++++++++ src/conf/virnwfilterbindingobj.h | 69 +++ src/conf/virnwfilterbindingobjlist.c | 487 ++++++++++++++++++ src/conf/virnwfilterbindingobjlist.h | 69 +++ src/conf/virnwfilterobj.c | 4 +- src/conf/virnwfilterobj.h | 4 + src/datatypes.c | 67 +++ src/datatypes.h | 31 ++ src/driver-nwfilter.h | 30 ++ src/libvirt-nwfilter.c | 305 +++++++++++ src/libvirt_private.syms | 45 +- src/libvirt_public.syms | 9 + src/lxc/lxc_driver.c | 28 - src/nwfilter/nwfilter_dhcpsnoop.c | 158 +++--- src/nwfilter/nwfilter_dhcpsnoop.h | 7 +- src/nwfilter/nwfilter_driver.c | 218 ++++++-- src/nwfilter/nwfilter_gentech_driver.c | 337 ++++++------ src/nwfilter/nwfilter_gentech_driver.h | 22 +- src/nwfilter/nwfilter_learnipaddr.c | 104 ++-- src/nwfilter/nwfilter_learnipaddr.h | 7 +- src/qemu/qemu_driver.c | 25 - src/remote/remote_daemon_dispatch.c | 15 + src/remote/remote_driver.c | 20 + src/remote/remote_protocol.x | 90 +++- src/remote_protocol-structs | 43 ++ src/rpc/gendispatch.pl | 15 +- src/uml/uml_driver.c | 29 -- src/util/virerror.c | 12 + tests/Makefile.am | 7 + .../filter-vars.xml | 11 + .../virnwfilterbindingxml2xmldata/simple.xml | 9 + tests/virnwfilterbindingxml2xmltest.c | 112 ++++ tests/virschematest.c | 1 + tools/virsh-completer.c | 45 ++ tools/virsh-completer.h | 4 + tools/virsh-nwfilter.c | 317 ++++++++++++ tools/virsh-nwfilter.h | 8 + 59 files changed, 3283 insertions(+), 829 deletions(-) create mode 100644 docs/schemas/nwfilter_params.rng create mode 100644 docs/schemas/nwfilterbinding.rng create mode 100644 src/conf/virnwfilterbindingdef.c create mode 100644 src/conf/virnwfilterbindingdef.h create mode 100644 src/conf/virnwfilterbindingobj.c create mode 100644 src/conf/virnwfilterbindingobj.h create mode 100644 src/conf/virnwfilterbindingobjlist.c create mode 100644 src/conf/virnwfilterbindingobjlist.h create mode 100644 tests/virnwfilterbindingxml2xmldata/filter-vars.xml create mode 100644 tests/virnwfilterbindingxml2xmldata/simple.xml create mode 100644 tests/virnwfilterbindingxml2xmltest.c -- 2.17.0

2 37

[libvirt] [PATCH] qemu: fix msg could be a wild pointer in qemuMonitorIOProcess()
by Weilun Zhu 22 Jun '18

22 Jun '18

As qemuMonitorJSONIOProcess will call qemuMonitorJSONIOProcessEvent which unlocks the monitor mutex, there is some extreme situation, eg qemu send message to monitor twice in a short time, where the local viriable 'msg' of qemuMonitorIOProcess could be a wild point: 1. qemuMonitorSend() assign mon->msg to parameter 'msg', which is alse a local variable of its caller qemuMonitorJSONCommandWithFd(), cause eventloop to send message to monitor, then wait condition. 2. qemu send message to monitor for the first time immediately. 3. qemuMonitorIOProcess() is called, then wake up the qemuMonitorSend() thread, but the qemuMonitorSend() thread stuck for a while as cpu pressure or some other reasons, which means the qemu monitor is still unlocked. 4. qemu send event message to monitor for the second time, such as RTC_CHANGE event 5. qemuMonitorIOProcess() is called again, the local viriable 'msg' is assigned to mon->msg. 6. qemuMonitorIOProcess() call qemuMonitorJSONIOProcess() to deal with the qemu event. 7. qemuMonitorJSONIOProcess() unlock the qemu monitor in the macro 'QEMU_MONITOR_CALLBACK', then qemuMonitorSend() thread get the mutex and free the mon->msg, assign mon->msg to NULL. Signed-off-by: Weilun Zhu <zhuweilun(a)huawei.com> --- src/qemu/qemu_monitor.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d6771c1d52..6ed475ede0 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -466,7 +466,11 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) #if DEBUG_IO VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len); #endif - if (msg && msg->finished) + + /* As the monitor mutex was unlocked in qemuMonitorJSONIOProcess() + * while dealing with qemu event, mon->msg could be changed which + * means the above 'msg' may be invalid, thus we use 'mon->msg' here */ + if (mon->msg && mon->msg->finished) virCondBroadcast(&mon->notify); return len; } -- 2.18.0.rc1

2 1

[libvirt] [PATCH] news: Document recent agent job change
by Michal Privoznik 22 Jun '18

22 Jun '18

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 08e5dcbda3..a3eea4eff6 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -71,6 +71,19 @@ Capabilities XML now provide information about host IOMMU support. </description> </change> + <change> + <summary> + qemu: Allow concurrent access to monitor and guest agent + </summary> + <description> + Historically libvirt prevented concurrent accesses to + the qemu monitor and the guest agent. Therefore two + independent calls (one querying the monitor and the + other querying guest agent) would serialize which hurts + performance. The code was reworked to allow two + independent calls run at the same time. + </description> + </change> </section> <section title="Bug fixes"> <change> -- 2.16.4

2 1

[libvirt] [PATCH] vmx: allow an odd number of vCPUs
by Pino Toscano 22 Jun '18

22 Jun '18

Most probably this was a limitation in older ESX versions, and it seems it does not exist anymore in more recent versions; see the following thread: https://www.redhat.com/archives/libvir-list/2018-May/msg02159.html https://www.redhat.com/archives/libvir-list/2018-June/msg00043.html Hence, allow an odd number (greater than 1) of vCPUs, since most probably older versions of ESXi will error out anyway. https://bugzilla.redhat.com/show_bug.cgi?id=1584091 Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- src/vmx/vmx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 35b4807d22..fe24b060d7 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -59,7 +59,7 @@ def->name = <value> <=> displayName = "<value>" def->mem.max_balloon = <value kilobyte> <=> memsize = "<value megabyte>" # must be a multiple of 4, defaults to 32 def->mem.cur_balloon = <value kilobyte> <=> sched.mem.max = "<value megabyte>" # defaults to "unlimited" -> def->mem.cur_balloon = def->mem.max_balloon def->mem.min_guarantee = <value kilobyte> <=> sched.mem.minsize = "<value megabyte>" # defaults to 0 -def->maxvcpus = <value> <=> numvcpus = "<value>" # must be 1 or a multiple of 2, defaults to 1 +def->maxvcpus = <value> <=> numvcpus = "<value>" # must be greater than 0, defaults to 1 def->cpumask = <uint list> <=> sched.cpu.affinity = "<uint list>" def->cputune.shares = <value> <=> sched.cpu.shares = "<value>" # with handling for special values # "high", "normal", "low" @@ -1452,10 +1452,10 @@ virVMXParseConfig(virVMXContext *ctx, if (virVMXGetConfigLong(conf, "numvcpus", &numvcpus, 1, true) < 0) goto cleanup; - if (numvcpus <= 0 || (numvcpus % 2 != 0 && numvcpus != 1)) { + if (numvcpus <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'numvcpus' to be an unsigned " - "integer (1 or a multiple of 2) but found %lld"), numvcpus); + "integer greater than 0 but found %lld"), numvcpus); goto cleanup; } @@ -3183,11 +3183,10 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe goto cleanup; } maxvcpus = virDomainDefGetVcpusMax(def); - if (maxvcpus == 0 || (maxvcpus % 2 != 0 && maxvcpus != 1)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'vcpu' to be 1 or a " - "multiple of 2 but found %d"), - maxvcpus); + if (maxvcpus == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting domain XML entry 'vcpu' to be greater " + "than 0")); goto cleanup; } -- 2.17.1

2 2

[libvirt] [PATCH] virDomainSnapshotDefParse: Prefer VIR_STEAL_PTR
by Michal Privoznik 22 Jun '18

22 Jun '18

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/snapshot_conf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 787c3d0feb..9c537ac7d1 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -331,8 +331,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, "disk-only snapshot")); goto cleanup; } - def->file = memoryFile; - memoryFile = NULL; + VIR_STEAL_PTR(def->file, memoryFile); /* verify that memory path is absolute */ if (def->file && def->file[0] != '/') { @@ -372,7 +371,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if (!offline && virSaveCookieParse(ctxt, &def->cookie, saveCookie) < 0) goto cleanup; - ret = def; + VIR_STEAL_PTR(ret, def); cleanup: VIR_FREE(creation); @@ -380,8 +379,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, VIR_FREE(nodes); VIR_FREE(memorySnapshot); VIR_FREE(memoryFile); - if (ret == NULL) - virDomainSnapshotDefFree(def); + virDomainSnapshotDefFree(def); return ret; } -- 2.16.4

2 1

[libvirt] [PATCH] qemu: Escape commas for qemuBuildDiskThrottling
by Anya Harter 21 Jun '18

21 Jun '18

Add comma escaping for disk->blkdeviotune.group_name. Signed-off-by: Anya Harter <aharter(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++-- tests/qemuxml2argvdata/name-escape.args | 5 +++++ tests/qemuxml2argvdata/name-escape.xml | 13 +++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 20c6ac2a04..e05b106a5e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1554,8 +1554,8 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk, IOTUNE_ADD(size_iops_sec, "iops-size"); if (disk->blkdeviotune.group_name) { - virBufferEscapeString(buf, ",throttling.group=%s", - disk->blkdeviotune.group_name); + virBufferAddLit(buf, ",throttling.group="); + virQEMUBuildBufferEscapeComma(buf, disk->blkdeviotune.group_name); } IOTUNE_ADD(total_bytes_sec_max_length, "bps-total-max-length"); diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args index 72ed2e8410..aef7c238ca 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -24,6 +24,11 @@ bar=2/monitor.sock,server,nowait \ -boot c \ -device usb-ccid,id=ccid0,bus=usb.0,port=1 \ -usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ +cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\ +throttling.bps-total-max=10000,throttling.iops-total-max=11000,\ +throttling.group=libvirt_iotune_group1,,foo \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ccid-card-emulated,backend=certificates,cert1=cert1,,foo,cert2=cert2,\ cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \ -chardev tty,id=charserial0,path=/dev/ttyS2,,foo \ diff --git a/tests/qemuxml2argvdata/name-escape.xml b/tests/qemuxml2argvdata/name-escape.xml index 0580de1813..70a1ce09d3 100644 --- a/tests/qemuxml2argvdata/name-escape.xml +++ b/tests/qemuxml2argvdata/name-escape.xml @@ -14,6 +14,19 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <iotune> + <total_bytes_sec>5000</total_bytes_sec> + <total_iops_sec>6000</total_iops_sec> + <total_bytes_sec_max>10000</total_bytes_sec_max> + <total_iops_sec_max>11000</total_iops_sec_max> + <group_name>libvirt_iotune_group1,foo</group_name> + </iotune> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> <graphics type='vnc'> <listen type='socket'/> </graphics> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a9a493e308..582a9de7bb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2758,6 +2758,8 @@ mymain(void) DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS, QEMU_CAPS_OBJECT_SECRET, + QEMU_CAPS_DRIVE_IOTUNE_MAX, + QEMU_CAPS_DRIVE_IOTUNE_GROUP, QEMU_CAPS_VNC, QEMU_CAPS_NAME_GUEST, QEMU_CAPS_DEVICE_CIRRUS_VGA, -- 2.17.1

2 1

[libvirt] [PATCH v3 0/4] cmdDomblkinfo: introduce --all to show all block devices info
by Chen Hanxiao 21 Jun '18

21 Jun '18

This series introduce --all to cmdDomblkinfo to show all block devices info in one cmd. Likes a combination of domblklist and domblkinfo. v3: check error code on network disk v2: add support --human for --all v1.1 fix a self test Chen Hanxiao (4): cmdDomblkinfo: introduce helper cmdDomblkinfoPrint cmdDomblkinfo: add --all to show all block devices info cmdDomblkinfoPrint: support printing "-" for invalid virDomainBlockInfo news: add cmdDomblkinfo --all option docs/news.xml | 10 +++ tools/virsh-domain-monitor.c | 160 ++++++++++++++++++++++++++++++----- tools/virsh.pod | 5 +- 3 files changed, 155 insertions(+), 20 deletions(-) -- 2.17.1

2 7

[libvirt] ANNOUNCE: libvirt-dbus 1.1.0 released
by Pavel Hrdina 21 Jun '18

21 Jun '18

I'm happy to announce the release of libvirt-dbus 1.1.0. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. You can download it here: https://libvirt.org/sources/dbus/libvirt-dbus-1.1.0.tar.gz * New features - Support for all relevant nwfilter APIs up to libvirt 3.0.0 - Support for all relevant storage volume APIs up to libvirt 3.0.0 - Support for all relevant node device APIs up to libvirt 3.0.0 * Bug fixes - Don't report error for GetAll on properties if some property is not accessible Thanks everybody who contributed! Pavel

1 0

[libvirt] [jenkins-ci PATCH 0/2] git changes to reflect new CI configuration
by Pavel Hrdina 21 Jun '18

21 Jun '18

Pavel Hrdina (2): jobs: Change git URL to github jobs: Switch to github webhook instead of polling jobs/autotools.yaml | 5 ++--- jobs/generic.yaml | 5 ++--- jobs/go.yaml | 5 ++--- jobs/perl-modulebuild.yaml | 5 ++--- jobs/python-distutils.yaml | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) -- 2.17.1

3 6

[libvirt] [dbus PATCH v2 0/5] tests: Some fixes and cleanups
by Andrea Bolognani 21 Jun '18

21 Jun '18

Changes from [v1]: * use the correct paths; * fix running libvirt-dbus from VPATH builds; * fix distcheck. [v1] https://www.redhat.com/archives/libvir-list/2018-June/msg01453.html Andrea Bolognani (5): tests: Include xmldata.py in EXTRA_DIST run: Fix VIRT_DBUS_INTERFACES_DIR run: Export abs_top_builddir tests: Drop fallback path for abs_top_builddir tests: Use AM_TESTS_ENVIRONMENT run.in | 6 ++---- tests/Makefile.am | 7 ++++--- tests/libvirttest.py | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH] cpu: add 'amd-ssbd' and 'amd-no-ssb' CPU features (CVE-2018-3639)
by Daniel P. Berrangé 21 Jun '18

21 Jun '18

AMD x86 CPUs have two separate ways to mitigate the Speculative Store Bypass hardware flaw. In current processors only non-architectural MSRs are available, and so hypervisors must expose a virtualized MSR and CPU flag "virt-ssbd" (CPUID Function 8000_0008, EBX[25]=1). In future processors AMD will provide an architectural MSR, indicated by existance of the CPUID Function 8000_0008, EBX[24]=1, to which QEMU has given the name "amd-ssbd". The "amd-ssbd" flag should be used in preference to "virt-ssbd", if it is available, since it provides improved performance. For virtual machine configuration, both should be exposed when available, to allow for maximal guest OS compatibility as not all guests yet support both. If future processes are not vulnerable to the flaw, this will be indicated by the existance of CPUID Function 8000_0008, EBX[26]=1, to which QEMU has given the name "amd-no-ssb". See also 124441_AMD64_SpeculativeStoreBypassDisable_Whitepaper_final.pdf from: https://bugzilla.kernel.org/show_bug.cgi?id=199889 Note that neither amd-ssbd or amd-no-ssb will be reported by the kernel in /proc/cpuinfo. It knows about these CPUID bits and does the right thing, but doesn't report their existance as distinct flags in /proc/cpuinfo. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/cpu/cpu_map.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 96daa0f9af..9af190a579 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -433,9 +433,15 @@ <feature name='ibpb'> <cpuid eax_in='0x80000008' ebx='0x00001000'/> </feature> + <feature name='amd-ssbd'> + <cpuid eax_in='0x80000008' ebx='0x01000000'/> + </feature> <feature name='virt-ssbd'> <cpuid eax_in='0x80000008' ebx='0x02000000'/> </feature> + <feature name='amd-no-ssb'> + <cpuid eax_in='0x80000008' ebx='0x04000000'/> + </feature>  <model name='486'> -- 2.17.0

3 4

[libvirt] [PATCH 0/1] *** SUBJECT HERE ***
by Han Han 21 Jun '18

21 Jun '18

*** BLURB HERE *** Han Han (1): docs: schema: Add missing <interleave> to devices docs/schemas/domaincommon.rng | 60 +++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 27 deletions(-) -- 2.17.1

1 1

[libvirt] [PATCH] schema: allow a <rule> element with no subelements in a nwfilter
by Laine Stump 21 Jun '18

21 Jun '18

This is a regression in behavior caused by commit 37359814. It was intended to limit the schema to allow only a single subelement of <rule>, but it is also acceptable for <rule> to have no subelement at all. To prevent the same error from reoccurring in the future, the examples/xml/nwfilter directory was added to the list of nwfilter schema test directories. Resolves: https://bugzilla.redhat.com/1593549 Signed-off-by: Laine Stump <laine(a)laine.org> --- docs/schemas/nwfilter.rng | 1 + tests/virschematest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index cca6ff2954..17cda5c78d 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -20,6 +20,7 @@ <element name="rule"> <ref name="rule-node-attributes"/> <choice> + <empty/> <element name="mac"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> diff --git a/tests/virschematest.c b/tests/virschematest.c index 2d35833919..aa65a434ff 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -229,7 +229,7 @@ mymain(void) DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin", "networkxml2xmlout", "networkxml2confdata"); DO_TEST_DIR("nodedev.rng", "nodedevschemadata"); - DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout"); + DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout", "../examples/xml/nwfilter"); DO_TEST_DIR("secret.rng", "secretxml2xmlin"); DO_TEST_DIR("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml2xmlout", "storagepoolschemadata"); -- 2.14.4

2 1

[libvirt] [PATCH 0/2] Two small problems with hyperv Makefile
by Laine Stump 21 Jun '18

21 Jun '18

I found these when make failed after running "make maintainer-clean". Laine Stump (2): hyperv: fix typo in Makefile.am.inc hyperv: erase "generated files" sentinel during make maintainer-clean src/hyperv/Makefile.inc.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.14.4

2 3

[libvirt] [dbus PATCH 0/3] tests: Some fixes and cleanups
by Andrea Bolognani 21 Jun '18

21 Jun '18

The first patch fixes an actual bug, the rest just makes things a bit nicer. Andrea Bolognani (3): tests: Fix VIRT_DBUS_INTERFACES_DIR tests: Don't loop up abs_top_builddir in the environment tests: Use AM_TESTS_ENVIRONMENT tests/Makefile.am | 5 ++--- tests/libvirttest.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.17.1

2 6

Re: [libvirt] [Qemu-devel] [PATCH RFC] hw/pc: set q35 as the default x86 machine
by Eduardo Habkost 21 Jun '18

21 Jun '18

Getting back to this discussion: On Tue, Jun 05, 2018 at 09:43:00AM +0100, Daniel P. Berrangé wrote: > On Tue, Jun 05, 2018 at 09:27:46AM +0200, Gerd Hoffmann wrote: > > Hi, > > > > > > Add to that shortcuts like -cdrom > > > > stop working, > > > > > > Maybe is fixable. > > > > Already fixed for ages. > > > > > I see marking Q35 as the default machine a first step. > > > > Maybe the better option is to go the arm route: Just don't define a > > default, so users have to specify pc or q35. That will make them notice > > there is a world beside 'pc', and we also avoid breaking things > > silently. > > If QEMU removes the default, then libvirt will have to hardcode > 'pc' as the default to maintain back compatibility, so I don't > think that ends up as a net win I believe there's consensus that applications blindly relying on the default machine-type when creating a domain is a bad idea. That said, can we deprecate this feature in libvirt, encourage applications to always specify an explicit machine-type, thus making it possible to deprecate the i440fx machine-types one day? -- Eduardo

4 9

[libvirt] [PATCH 0/3] some small fix for guest SEV related code
by Luyao Huang 21 Jun '18

21 Jun '18

*** BLURB HERE *** Luyao Huang (3): qemu: correct the ret value qemu: improve the debug message when preparing SEV guest docs: remove extra space in the SEV xml element example docs/formatdomain.html.in | 10 +++++----- src/qemu/qemu_process.c | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) -- 1.8.3.1

2 5

Re: [libvirt] [Qemu-devel] [PATCH] hw/i386: Deprecate the machine types pc-0.10 and pc-0.11
by Eduardo Habkost 21 Jun '18

21 Jun '18

(CCing Markus and libvir-list) On Wed, Jun 20, 2018 at 08:40:38PM +0200, Thomas Huth wrote: > On 12.06.2018 00:18, Eduardo Habkost wrote: > > On Mon, Jun 11, 2018 at 05:41:04AM +0200, Thomas Huth wrote: > >> The oldest machine type which is still used in a maintained distribution > >> is a pc-0.12 based machine type in RHEL6, so everything that is older > >> than pc-0.12 should not be used anymore. Thus let's deprecate pc-0.10 > >> and pc-0.11 so that we can finally remove them in a future release. > [...] > >> @@ -3952,6 +3953,10 @@ int main(int argc, char **argv, char **envp) > >> } > >> > >> machine_class = select_machine(); > >> + if (machine_class->deprecation_msg) { > >> + error_report("Machine type '%s' is deprecated: %s", > >> + machine_class->name, machine_class->deprecation_msg); > >> + } > > > > Do you plan to add this info to 'query-machines' QMP command? > > No, I'm not planning to add this. We'd need a request from upper layers > (i.e. libvirt) for this first, otherwise it's just a dead interface that > nobody is using. I believe that useful information being available only through stderr is at least as bad as being available only through HMP. Should we extend QMP more proactively in cases like this, too? (In either case, I don't think this should block your series) -- Eduardo

1 0

[libvirt] [PATCH 0/5] Fix a couple of force snapshot revert issues
by John Ferlan 20 Jun '18

20 Jun '18

Well, at least I hope so. There's a couple of related bz's in the last two patches with gobs more details, but the long and short of it is that when using the force flag, the domain is Stop'd and re-Start'd without applying any snapshot. For both issues I've seen, the "error: internal error: unexpected async job 6" occurs on the Start and thus the CPU's aren't started. For one bz, when running managedsave the call never returns. For the other bz, one cannot restart the paused domain. If there's a better way to do this - I'm sure someone will let me know. John Ferlan (5): qemu: Adjust async job failure message qemu: Promote start_flags in qemuDomainRevertToSnapshot qemu: Use start_flags for RUNNING and PAUSED transitions qemu: Unset the genid start change flag for revert force qemu: Don't use asyncJob after stop during snapshot revert src/qemu/qemu_domain.c | 3 ++- src/qemu/qemu_driver.c | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) -- 2.14.4

2 8

[libvirt] [PATCH 0/6] qemu: command: Replace vlan= with netdev=
by Cole Robinson 20 Jun '18

20 Jun '18

Most VMs libvirt knows how to launch will have qemu network config like: -netdev $NETDEV_OPTS,id=netdev1 -device e1000,id=netdev1 However for machine types with built-in platform network devices, we currently do: -net nic,model=e1000,vlan=1 -net $NETDEV_OPTS,vlan=1 However for the platform case, all qemu versions we support can do: -netdev $NETDEV_OPTS,id=netdev1 -net nic,model=e1000,netdev=netdev1 Which simplifies our code, and is more future proof as qemu has deprecated the vlan= option. This series switches to the netdev= method, and performs some cleanups in related code. Thanks, Cole Cole Robinson (6): qemu: command: Make qemuBuildNicStr static qemu: command: Rename BuildNicStr to BuildLegacyNicStr qemu: command: remove unused LegacyNicStr arg 'prefix' qemu: command: replace vlan= with netdev= for legacy nic qemu: Remove vlan function arguments qemu: command: vhost: cleanup error reporting src/qemu/qemu_command.c | 99 ++++++------------- src/qemu/qemu_command.h | 8 -- src/qemu/qemu_hotplug.c | 3 +- .../arm-vexpressa9-basic.args | 4 +- 4 files changed, 33 insertions(+), 81 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH 0/4] qemu: add comma escaping in qemu_command.c
by Anya Harter 20 Jun '18

20 Jun '18

The function virQEMUBuildBufferEscapeComma is used to escape commas in user provided fields for qemu command line processing in the four functions listed below. A corresponding test for each comma escaping instance has been added to tests/qemuxml2argvdata/name-escape.xml. This should complete the BiteSizedTask entry at https://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_m…. Anya Harter (4): qemu: Escape commas for qemuBuildChrChardevStr qemu: Escape commas for qemuBuildChrChardevFileStr qemu: Escape commas for qemuBuildSmartcardCommandLine qemu: Escape commas for qemuBuildGrapicsSPICECommandLine src/qemu/qemu_command.c | 44 +++++++++++-------------- tests/qemuxml2argvdata/name-escape.args | 14 ++++++-- tests/qemuxml2argvdata/name-escape.xml | 18 ++++++++++ tests/qemuxml2argvtest.c | 10 +++++- 4 files changed, 58 insertions(+), 28 deletions(-) -- 2.17.1

3 13

[libvirt] libvirt profiles (a.k.a. virtuned) design ideas draft
by Martin Kletzander 20 Jun '18

20 Jun '18

After some discussion with people from various management apps we decided to try and create something that would help with common, duplicated, and perhaps easy to extract things for which the code exists in some (or most) of the projects. I'd be glad for any feedback, so here is the rendered document: https://github.com/nertpinx/virt-manager/blob/virtuned-docs/docs/virtuned.md and here you can comment: https://github.com/nertpinx/virt-manager/pull/1/files Even though this does not concern libvirt developers, I'm adding pointers here in case someone wants to chime in.

1 0

[libvirt] [PATCH v3 0/4] qemu: Allow concurrent access to monitor and guest agent
by Michal Privoznik 20 Jun '18

20 Jun '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-June/msg01358.html Patches 1/4 and 2/4 are ACKed already. Patch 3/4 is new and implements agent job acquiring when doing snapshots (as suggested by Jirka in his review). Patch 4/4 is written differently (again as suggested by him) although the semantic is the same as in previous version of the patch. Michal Privoznik (4): qemu: Introduce qemuDomainAgentJob qemu: Introduce APIs for manipulating qemuDomainAgentJob qemuDomainSnapshotCreateActiveExternal: Grab agent job qemu: Switch code to use new agent job APIs src/qemu/THREADS.txt | 112 +++++++++++++++++++++++--- src/qemu/qemu_domain.c | 211 ++++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_domain.h | 30 +++++++ src/qemu/qemu_driver.c | 124 ++++++++++++++++++++--------- 4 files changed, 390 insertions(+), 87 deletions(-) -- 2.16.4

2 6

[libvirt] [PATCH 0/2] Fixes for segfault and deadlock
by Marc Hartmayer 20 Jun '18

20 Jun '18

One way to reproduce the bugs is to set admin_max_workers=0 in libvirtd.conf, restart libvirtd, and then call: $ virt-admin server-threadpool-info admin Marc Hartmayer (2): rpc: Fix deadlock if there is no worker pool available rpc: Fix segmentation fault when no worker pool is available src/rpc/virnetserver.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) -- 2.13.6

3 15

[libvirt] [PATCH v2] qemu: fix msg could be a wild pointer in qemuMonitorIOProcess()
by Weilun Zhu 20 Jun '18

20 Jun '18

As qemuMonitorJSONIOProcess() will unlock the qemu monitor, there is some extreme situation, eg qemu send message to monitor twice in a short time, where the local viriable 'msg' of qemuMonitorIOProcess() could be a wild point: 1. qemuMonitorSend() assign mon->msg to parameter 'msg', which is alse a local variable of its caller qemuMonitorJSONCommandWithFd(), cause eventloop to send message to monitor, then wait condition. 2. qemu send message to monitor for the first time immediately. 3. qemuMonitorIOProcess() is called, then wake up the qemuMonitorSend() thread, but the qemuMonitorSend() thread stuck for a while as cpu pressure or some other reasons,, which means the qemu monitor is still unlocked. 4. qemu send event message to monitor for the second time, such as RTC_CHANGE event 5. qemuMonitorIOProcess() is called, the local viriable 'msg' is assigned to mon->msg. 6. qemuMonitorIOProcess() call qemuMonitorJSONIOProcess() to deal with the qemu event. 7. qemuMonitorJSONIOProcess() unlock the qemu monitor in the macro 'QEMU_MONITOR_CALLBACK', then qemuMonitorSend() thread get the mutex and free the mon->msg, assign mon->msg to NULL. so the local viriable 'msg' of qemuMonitorIOProcess() is a wild pointer now. AFAIK, it is not harmful to call again virCondBroadcast() while msg is a wild pointer, but just in case, we fix it in this patch. --- src/qemu/qemu_monitor.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 215135aa3e..a4b8572e24 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -463,6 +463,14 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) #if DEBUG_IO VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len); #endif + + /* As the monitor mutex was unlocked in qemuMonitorJSONIOProcess() + * while dealing with qemu event, mon->msg could be changed, + * thus we re-acquire the msg here */ + msg = NULL; + if (mon->msg && mon->msg->txOffset == mon->msg->txLength) { + msg = mon->msg; + if (msg && msg->finished) virCondBroadcast(&mon->notify); return len; -- 2.18.0.rc1

3 2

Re: [libvirt] [Qemu-devel] [PATCH v7 1/3] qmp: adding 'wakeup-suspend-support' in query-target
by Markus Armbruster 20 Jun '18

20 Jun '18

Cc'ing a few more people. Daniel Henrique Barboza <danielhb(a)linux.ibm.com> writes: > When issuing the qmp/hmp 'system_wakeup' command, what happens in a > nutshell is: > > - qmp_system_wakeup_request set runstate to RUNNING, sets a wakeup_reason > and notify the event > - in the main_loop, all vcpus are paused, a system reset is issued, all > subscribers of wakeup_notifiers receives a notification, vcpus are then > resumed and the wake up QAPI event is fired > > Note that this procedure alone doesn't ensure that the guest will awake > from SUSPENDED state - the subscribers of the wake up event must take > action to resume the guest, otherwise the guest will simply reboot. > > At this moment there are only two subscribers of the wake up event: one > in hw/acpi/core.c and another one in hw/i386/xen/xen-hvm.c. This means > that system_wakeup does not work as intended with other architectures. > > However, only the presence of 'system_wakeup' is required for QGA to > support 'guest-suspend-ram' and 'guest-suspend-hybrid' at this moment. > This means that the user/management will expect to suspend the guest using > one of those suspend commands and then resume execution using system_wakeup, > regardless of the support offered in system_wakeup in the first place. > > This patch adds a new flag called 'wakeup-suspend-support' in TargetInfo > that allows the caller to query if the guest supports wake up from > suspend via system_wakeup. It goes over the subscribers of the wake up > event and, if it's empty, it assumes that the guest does not support > wake up from suspend (and thus, pm-suspend itself). > > This is the expected output of query-target when running a x86 guest: > > {"execute" : "query-target"} > {"return": {"arch": "x86_64", "wakeup-suspend-support": true}} > > This is the output when running a pseries guest: > > {"execute" : "query-target"} > {"return": {"arch": "ppc64", "wakeup-suspend-support": false}} > > Given that the TargetInfo structure is read-only, adding a new flag to > it is backwards compatible. There is no need to deprecate the old > TargetInfo format. > > With this extra tool, management can avoid situations where a guest > that does not have proper suspend/wake capabilities ends up in > inconsistent state (e.g. > https://github.com/open-power-host-os/qemu/issues/31) > > Reported-by: Balamuruhan S <bala24(a)linux.vnet.ibm.com> > Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.ibm.com> Is query-target is the right place to carry this flag? v7 is rather late for this kind of question; my sincere apologies. The flag is true after qemu_register_wakeup_notifier(). Callers so far: * piix4_pm_realize() via acpi_pm1_cnt_init() This is the realize method of device PIIX4_PM. It's an optional onboard device (suppressed by -no-acpi) of machine types pc-i440fx-VERSION, pc-VERSION, malta. * pc_q35_init() via ich9_lpc_pm_init(), ich9_pm_init(), acpi_pm1_cnt_init() This is the initialization method of machine types pc-q35-VERSION. Note that -no-acpi is not honored. * vt82c686b_pm_realize() via acpi_pm1_cnt_init() This is the realize method of device VT82C686B_PM. It's an onboard device of machine type fulong2e. Again, -no-acpi is not honored. * xen_hvm_init() This one gets called with -accel xen. I suspect the actual callback xen_wakeup_notifier() doesn't actually make wakeup work, unlike the acpi_notify_wakeup() callback registered by the other callers. Issue#1: this calls into question your assumption that the existence of a wake-up notifier implies wake-up works. It still holds if --accel xen is only accepted together with other configuration that triggers registration of acpi_notify_wakeup(). Is it? Stefano, Anthony? Issue#2: the flag isn't a property of the target. Due to -no-acpi, it's not even a property of the machine type. If it was, query-machines would be the natural owner of the flag. Perhaps query-machines is still the proper owner. The value of wakeup-suspend-support would have to depend on -no-acpi for the machine types that honor it. Not ideal; I'd prefer MachineInfo to be static. Tolerable? I guess that's also a libvirt question.

3 14

[libvirt] [dbus PATCH] maint: fix coding style
by Katerina Koukiou 20 Jun '18

20 Jun '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/connect.c | 12 ++++++------ src/domain.c | 2 +- src/events.c | 24 ++++++++++++------------ src/network.c | 2 +- src/util.c | 6 +++--- src/util.h | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/connect.c b/src/connect.c index 2e57d69..09e5628 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1187,12 +1187,12 @@ virtDBusConnectNWFilterDefineXML(GVariant *inArgs, static void virtDBusConnectNWFilterLookupByName(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, - gpointer userData, - GVariant **outArgs, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virNWFilter) nwfilter = NULL; diff --git a/src/domain.c b/src/domain.c index 4aeb855..5c5e6da 100644 --- a/src/domain.c +++ b/src/domain.c @@ -2189,7 +2189,7 @@ virtDBusDomainMigrateToURI3(GVariant *inArgs, virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; g_autoptr(GVariantIter) iter = NULL; - const gchar* dconuri; + const gchar *dconuri; g_auto(virtDBusUtilTypedParams) params = { 0 }; guint flags; diff --git a/src/events.c b/src/events.c index 7cdc71d..e635a61 100644 --- a/src/events.c +++ b/src/events.c @@ -546,10 +546,10 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection G_GNUC_UNUSED, static gint virtDBusEventsNetworkEvent(virConnectPtr connection G_GNUC_UNUSED, - virNetworkPtr network, - gint event, - gint detail G_GNUC_UNUSED, - gpointer opaque) + virNetworkPtr network, + gint event, + gint detail G_GNUC_UNUSED, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -592,10 +592,10 @@ virtDBusEventsNodeDeviceEvent(virConnectPtr connection G_GNUC_UNUSED, static gint virtDBusEventsSecretEvent(virConnectPtr connection G_GNUC_UNUSED, - virSecretPtr secret, - gint event, - gint detail, - gpointer opaque) + virSecretPtr secret, + gint event, + gint detail, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -615,10 +615,10 @@ virtDBusEventsSecretEvent(virConnectPtr connection G_GNUC_UNUSED, static gint virtDBusEventsStoragePoolEvent(virConnectPtr connection G_GNUC_UNUSED, - virStoragePoolPtr storagePool, - gint event, - gint detail, - gpointer opaque) + virStoragePoolPtr storagePool, + gint event, + gint detail, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; diff --git a/src/network.c b/src/network.c index 1bacb81..3957ee6 100644 --- a/src/network.c +++ b/src/network.c @@ -235,7 +235,7 @@ virtDBusNetworkGetDHCPLeases(GVariant *inArgs, g_variant_builder_add(&builder, "(sxisssuss)", lease->iface, lease->expirytime, lease->type, lease->mac, - lease->iaid ? lease->iaid : "" , + lease->iaid ? lease->iaid : "", lease->ipaddr, lease->prefix, lease->hostname ? lease->hostname : "", lease->clientid ? lease->clientid : ""); diff --git a/src/util.c b/src/util.c index a1b29dd..8c822f2 100644 --- a/src/util.c +++ b/src/util.c @@ -348,8 +348,8 @@ virtDBusUtilVirNodeDeviceListFree(virNodeDevicePtr *devs) virNWFilterPtr virtDBusUtilVirNWFilterFromBusPath(virConnectPtr connection, - const gchar *path, - const gchar *nwfilterPath) + const gchar *path, + const gchar *nwfilterPath) { g_autofree gchar *name = NULL; gsize prefixLen = strlen(nwfilterPath) + 1; @@ -361,7 +361,7 @@ virtDBusUtilVirNWFilterFromBusPath(virConnectPtr connection, gchar * virtDBusUtilBusPathForVirNWFilter(virNWFilterPtr nwfilter, - const gchar *nwfilterPath) + const gchar *nwfilterPath) { gchar uuid[VIR_UUID_STRING_BUFLEN] = ""; g_autofree gchar *newUuid = NULL; diff --git a/src/util.h b/src/util.h index 7db0e25..a688a3d 100644 --- a/src/util.h +++ b/src/util.h @@ -67,8 +67,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListF virNetworkPtr virtDBusUtilVirNetworkFromBusPath(virConnectPtr connection, - const gchar *path, - const gchar *networkPath); + const gchar *path, + const gchar *networkPath); gchar * virtDBusUtilBusPathForVirNetwork(virNetworkPtr network, -- 2.15.0

2 1

[libvirt] [PATCH] conf: Remove unused virDomainDefNewFull
by Cole Robinson 20 Jun '18

20 Jun '18

The last usages were removed with the xend driver in 1dac5fbbbb0 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/domain_conf.c | 22 ---------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - 3 files changed, 26 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 522e0c2bf3..f0b604e125 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3241,28 +3241,6 @@ virDomainDefNew(void) } -virDomainDefPtr -virDomainDefNewFull(const char *name, - const unsigned char *uuid, - int id) -{ - virDomainDefPtr def; - - if (!(def = virDomainDefNew())) - return NULL; - - if (VIR_STRDUP(def->name, name) < 0) { - VIR_FREE(def); - return NULL; - } - - memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); - def->id = id; - - return def; -} - - void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, bool live, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6344c02d1c..8cefef535a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2919,9 +2919,6 @@ virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt); virDomainChrDefPtr virDomainChrDefNew(virDomainXMLOptionPtr xmlopt); virDomainDefPtr virDomainDefNew(void); -virDomainDefPtr virDomainDefNewFull(const char *name, - const unsigned char *uuid, - int id); void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ea24f2847c..98913a577a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -287,7 +287,6 @@ virDomainDefMaybeAddController; virDomainDefMaybeAddInput; virDomainDefNeedsPlacementAdvice; virDomainDefNew; -virDomainDefNewFull; virDomainDefParseFile; virDomainDefParseNode; virDomainDefParseString; -- 2.17.1

2 2

[libvirt] [PATCH] qemu: Fix domain resume after failed migration
by Jiri Denemark 19 Jun '18

19 Jun '18

Libvirt relies on being able to kill the destination domain and resume the source one during migration until we called "cont" on the destination. Unfortunately, QEMU automatically activates block devices at the end of migration even when it's called with -S. This wasn't a big issue in the past since the guest is not running and thus no data are written to the block devices. However, when QEMU introduced its internal block device locks, we can no longer resume the source domain once the destination domain already activated the block devices (and thus acquired all locks) unless the destination domain is killed first. Since it's impossible to synchronize the destination and the source libvirt daemons after a failed migration, QEMU introduced a new migration capability called "late-block-activat" which ensures QEMU won't activate block devices until it gets "cont". The only thing we need to do is to enable this capability whenever QEMU supports it. https://bugzilla.redhat.com/show_bug.cgi?id=1568407 QEMU commit implementing the capability: v2.12.0-952-g0f073f44df Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration_params.c | 4 ++++ src/qemu/qemu_migration_params.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 2083563d32..63d20ff5dc 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -84,6 +84,7 @@ VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST, "postcopy-ram", "compress", "pause-before-switchover", + "late-block-activate", ); @@ -129,6 +130,9 @@ struct _qemuMigrationParamsTPMapItem { static const qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysOn[] = { {QEMU_MIGRATION_CAP_PAUSE_BEFORE_SWITCHOVER, QEMU_MIGRATION_SOURCE}, + + {QEMU_MIGRATION_CAP_LATE_BLOCK_ACTIVATE, + QEMU_MIGRATION_DESTINATION}, }; /* Translation from virDomainMigrateFlags to qemuMigrationCapability. */ diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 9a865b19f3..bee503d0f4 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -37,6 +37,7 @@ typedef enum { QEMU_MIGRATION_CAP_POSTCOPY, QEMU_MIGRATION_CAP_COMPRESS, QEMU_MIGRATION_CAP_PAUSE_BEFORE_SWITCHOVER, + QEMU_MIGRATION_CAP_LATE_BLOCK_ACTIVATE, QEMU_MIGRATION_CAP_LAST } qemuMigrationCapability; -- 2.17.1

4 3

[libvirt] [v2 RESEND 0/3] qemu: Allow concurrent access to monitor and guest agent
by Michal Privoznik 19 Jun '18

19 Jun '18

Obsoletes: https://www.redhat.com/archives/libvir-list/2018-June/msg01320.html This is the same version as the one linked above, but since I've merged my other patchset that touches the same area in the code reviewers will get merge conflicts when applying these. Rebase & resend. Michal Privoznik (3): qemu: Introduce qemuDomainAgentJob qemu: Introduce APIs for manipulating qemuDomainAgentJob qemu: Switch code to use new agent job APIs src/qemu/THREADS.txt | 112 +++++++++++++++++++++++++--- src/qemu/qemu_domain.c | 193 ++++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_domain.h | 30 ++++++++ src/qemu/qemu_driver.c | 91 ++++++++++++++--------- 4 files changed, 346 insertions(+), 80 deletions(-) -- 2.16.4

3 8

[libvirt] [dbus PATCH 00/14] Introduce NodeDevice APIs
by Katerina Koukiou 19 Jun '18

19 Jun '18

Katerina Koukiou (14): Introduce NodeDevice Interface Implement ListNodeDevices method for Connect Interface Register NodeDevice Lifecycle Events Implement NodeDeviceCreateXML method for Connect Interface Implement Destroy method for NodeDevice Interface Implement Detach method for NodeDevice Interface Implement Name property for NodeDevice Interface Implement Parent property for NodeDevice Interface Implement GetXMLDesc property for NodeDevice Interface Implement ListCaps method for NodeDevicesInterface Implement NodeDeviceLookupByName method for Connect Interface Implement NodeDeviceLookupSCSIHostByWWN method for Connect Interface Implement ReAttach method for NodeDevice Interface Implement Reset method for NodeDevice Interface data/Makefile.am | 1 + data/org.libvirt.Connect.xml | 34 +++++ data/org.libvirt.NodeDevice.xml | 45 +++++++ src/Makefile.am | 1 + src/connect.c | 148 +++++++++++++++++++++ src/connect.h | 2 + src/events.c | 42 ++++++ src/nodedev.c | 283 ++++++++++++++++++++++++++++++++++++++++ src/nodedev.h | 9 ++ src/util.c | 35 +++++ src/util.h | 15 +++ tests/Makefile.am | 1 + tests/libvirttest.py | 13 ++ tests/test_connect.py | 27 ++++ tests/test_nodedev.py | 52 ++++++++ tests/xmldata.py | 16 +++ 16 files changed, 724 insertions(+) create mode 100644 data/org.libvirt.NodeDevice.xml create mode 100644 src/nodedev.c create mode 100644 src/nodedev.h create mode 100755 tests/test_nodedev.py -- 2.15.0

2 28

[libvirt] [PATCH 0/2] A potential deadlock fix for SEV and a tiny cleanup
by Erik Skultety 19 Jun '18

19 Jun '18

*** BLURB HERE *** Erik Skultety (2): qemu: sev: Use EnterMonitor instead of EnterMonitorAsync qemu: sev: Don't jump to endjob if SEV measurement retrieval fails src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.14.4

2 5

[libvirt] [PATCH v2 0/3] Implement the HTM pSeries feature
by Andrea Bolognani 19 Jun '18

19 Jun '18

Applies cleanly on top of b1acfaaf890a16ecb2fecdbe7f121eff314dd0e9. Changes from [v1]: * drop qom-list-properties machinery, as equivalent functionality has been merged in the meantime; * don't introduce scaffolding for uniform machine option handling as a requirement for implementing this specific feature: we can do ad-hoc processing for now, per the status quo, then clean up everything (including existing features) with a separate series later. Changes from [RFC v3]: * can be considered for merging, since the QEMU part already has; * fix compatibility issues with QEMU <2.12 spotted by Shivaprasad; * drop all features except for HTM, at least for the time being; * add documentation. Changes from [RFC v2]: * use qom-list-properties to probe availability; * test all features with a single XML file. Changes from [RFC v1]: * don't nest features inside a <pseries/> element; * implement all optional features. [v1] https://www.redhat.com/archives/libvir-list/2018-March/msg00474.html [RFC v3] https://www.redhat.com/archives/libvir-list/2018-March/msg00042.html [RFC v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00310.html [RFC v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (3): qemu: Add capability for the HTM pSeries feature qemu: Implement the HTM pSeries feature news: Update for the HTM pSeries feature docs/formatdomain.html.in | 8 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 19 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 ++ src/qemu/qemu_domain.c | 13 ++ .../caps_2.12.0.aarch64.replies | 48 +++-- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.replies | 197 ++++++++++++++++-- .../caps_2.12.0.ppc64.xml | 3 +- .../caps_2.12.0.s390x.replies | 52 +++-- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 64 +++--- .../caps_2.12.0.x86_64.xml | 2 +- tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 21 files changed, 383 insertions(+), 77 deletions(-) -- 2.17.1

1 3

[libvirt] [PATCH] tests: Fix qemucapsfixreplies
by Andrea Bolognani 19 Jun '18

19 Jun '18

Since e6be524508d5 we include the executed command along with the reply in *.replies files, which breaks the renumbering logic implemented in qemucapsfixreplies. Adapt the script so that it works with the new format. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemucapsfixreplies | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/qemucapsfixreplies b/tests/qemucapsfixreplies index 4e3371a1f7..597f9ecd6e 100755 --- a/tests/qemucapsfixreplies +++ b/tests/qemucapsfixreplies @@ -8,7 +8,7 @@ if [ "$#" -ne 1 ] || [ "$1" = "--help" ] || [ ! -f "$1" ]; then fi awk -i inplace \ - 'BEGIN {count=1; pattern="libvirt-[0-9]+"} + 'BEGIN {last=0; pattern="libvirt-[0-9]+"} { if (match($0, "libvirt-1[^0-9]")) { count=1; @@ -16,7 +16,11 @@ awk -i inplace \ if (match($0, pattern)) { str="libvirt-" count; sub(pattern, str, $0); - count++; + if (last != count) { + last=count; + } else { + count++; + } } print }' "$1" -- 2.17.1

2 1

[libvirt] [PATCH] Add condiitonal definition for constants
by Daniel P. Berrangé 19 Jun '18

19 Jun '18

To be able to build against older libvirt, we need to conditionally define the constants, even though they're not exposed in the public API. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as build fix. connect_compat.h | 16 ++++++++++++++++ domain_compat.h | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/connect_compat.h b/connect_compat.h index cd6d678..f780e58 100644 --- a/connect_compat.h +++ b/connect_compat.h @@ -243,4 +243,20 @@ int virNodeGetSEVInfoCompat(virConnectPtr conn, int *nparams, unsigned int flags); +#ifndef VIR_NODE_SEV_CBITPOS +#define VIR_NODE_SEV_CBITPOS "cbitpos" +#endif + +#ifndef VIR_NODE_SEV_REDUCED_PHYS_BITS +#define VIR_NODE_SEV_REDUCED_PHYS_BITS "reduced-phys-bits" +#endif + +#ifndef VIR_NODE_SEV_PDH +#define VIR_NODE_SEV_PDH "pdh" +#endif + +#ifndef VIR_NODE_SEV_CERT_CHAIN +#define VIR_NODE_SEV_CERT_CHAIN "cert-chain" +#endif + #endif /* LIBVIRT_GO_CONNECT_COMPAT_H__ */ diff --git a/domain_compat.h b/domain_compat.h index 5c93ef5..345505c 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -1042,4 +1042,8 @@ int virDomainGetLaunchSecurityInfoCompat(virDomainPtr domain, int *nparams, unsigned int flags); +#ifndef VIR_DOMAIN_LAUNCH_SECURITY_SEV_MEASUREMENT +#define VIR_DOMAIN_LAUNCH_SECURITY_SEV_MEASUREMENT "sev-measurement" +#endif + #endif /* LIBVIRT_GO_DOMAIN_COMPAT_H__ */ -- 2.17.0

2 1

[libvirt] [dbus PATCH] README: Drop warning about lack of API/ABI guarantees
by Andrea Bolognani 19 Jun '18

19 Jun '18

We have promised not to break compatibility after v1.0.0, which means the warning is no longer accurate and should be dropped. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 1ce265c..66aa6f6 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,6 @@ The latest official releases can be found at: * [https://libvirt.org/sources/dbus/](https://libvirt.org/sources/dbus/) -NB: at this time, libvirt-dbus is *NOT* considered API/ABI stable. Future -releases may still include API/ABI incompatible changes. - Dependencies / supported platforms ---------------------------------- -- 2.17.1

2 1

[libvirt] [PATCH v2 0/5] Introduce VIR_CONNECT_GET_ALL_DOMAINS_STATS_NOWAIT
by Michal Privoznik 19 Jun '18

19 Jun '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-June/msg00546.html diff to v1: - Rename to STATS_NOWAIT - John's review worked in - added comment to qemuDomainObjBeginJobNowait Michal Privoznik (5): qemu_domain: Document qemuDomainObjBeginJob qemuDomainObjBeginJobInternal: Remove spurious @ret assignment qemu_domain: Introduce qemuDomainObjBeginJobNowait Introduce VIR_CONNECT_GET_ALL_DOMAINS_STATS_NOWAIT virsh: Introduce --nowait to domstats include/libvirt/libvirt-domain.h | 2 ++ src/libvirt-domain.c | 12 ++++++++ src/qemu/qemu_domain.c | 60 +++++++++++++++++++++++++++++++++++----- src/qemu/qemu_domain.h | 4 +++ src/qemu/qemu_driver.c | 15 ++++++++-- tools/virsh-domain-monitor.c | 7 +++++ tools/virsh.pod | 16 +++++++---- 7 files changed, 101 insertions(+), 15 deletions(-) -- 2.16.4

3 9

[libvirt] [PATCH] tests: add test file for smartcard database
by Anya Harter 19 Jun '18

19 Jun '18

Add test case explicitly defining a smartcard host certificates database via the following xml: <smartcard mode='host-certificates'> <database>/tmp/foo</database> </smartcard> This case is not currently covered in the test suite. Signed-off-by: Anya Harter <aharter(a)redhat.com> --- .../smartcard-host-certificates-database.args | 28 +++++++++++++++ .../smartcard-host-certificates-database.xml | 21 +++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../smartcard-host-certificates-database.xml | 35 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 87 insertions(+) create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates-database.args create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates-database.xml create mode 100644 tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args new file mode 100644 index 0000000000..bc159f234d --- /dev/null +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -0,0 +1,28 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot c \ +-device usb-ccid,id=ccid0,bus=usb.0,port=1 \ +-usb \ +-device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,\ +cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml new file mode 100644 index 0000000000..fa35645736 --- /dev/null +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <smartcard mode='host-certificates'> + <certificate>cert1</certificate> + <certificate>cert2</certificate> + <certificate>cert3</certificate> + <database>/tmp/foo</database> + </smartcard> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f44cac9fef..194a8d2bab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1404,6 +1404,8 @@ mymain(void) QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-host-certificates", QEMU_CAPS_CCID_EMULATED); + DO_TEST("smartcard-host-certificates-database", + QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-passthrough-tcp", QEMU_CAPS_CCID_PASSTHRU); DO_TEST("smartcard-passthrough-spicevmc", diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml new file mode 100644 index 0000000000..55d54a4355 --- /dev/null +++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ccid' index='0'/> + <smartcard mode='host-certificates'> + <certificate>cert1</certificate> + <certificate>cert2</certificate> + <certificate>cert3</certificate> + <database>/tmp/foo</database> + <address type='ccid' controller='0' slot='0'/> + </smartcard> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f5805c7f50..4449954ad4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1163,6 +1163,7 @@ mymain(void) DO_TEST("smartcard-host", NONE); DO_TEST("smartcard-host-certificates", NONE); + DO_TEST("smartcard-host-certificates-database", NONE); DO_TEST("smartcard-passthrough-tcp", NONE); DO_TEST("smartcard-passthrough-spicevmc", NONE); DO_TEST("smartcard-controller", NONE); -- 2.17.1

2 1

[libvirt] [PATCH] qemu: Fix qemuMonitorCreateObjectProps
by John Ferlan 18 Jun '18

18 Jun '18

Commit id f0a23c0c3 introduced qemuMonitorCreateObjectProps to manage wrapping the object name and alias; however, calling virJSONValueObjectCreateVArgs and checking a unary ! return status meant when the CreateVAArgs function returned zero, then rather than generating a @propsret, the jump to cleanup would result in an unexpected failure and cause virsh to issue the "error: An error occurred, but the cause is unknown" error message for something like "virsh iothreadadd $DOM 10" (assuming that IOThread 10 didn't already exist). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b29672d4f1..d6771c1d52 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3051,7 +3051,7 @@ qemuMonitorCreateObjectProps(virJSONValuePtr *propsret, va_start(args, alias); - if (!(virJSONValueObjectCreateVArgs(&props, args))) + if (virJSONValueObjectCreateVArgs(&props, args) < 0) goto cleanup; if (!(*propsret = qemuMonitorCreateObjectPropsWrap(type, alias, &props))) -- 2.14.4

2 2

[libvirt] [libvirt-go-xml PATCH v2 0/2] Add support for domain launch security
by Erik Skultety 18 Jun '18

18 Jun '18

since v1: - added a launch security subtype for SEV to avoid having a 'type' XML attribute Erik Skultety (2): Add support for domain launch security Add support for SEV in domain capabilities XML domain.go | 162 ++++++++++++++++++++++++++++++++++++++++++++++++- domain_capabilities.go | 7 +++ 2 files changed, 168 insertions(+), 1 deletion(-) -- 2.14.4

2 5

[libvirt] [dockerfiles PATCH] README: Provide information about the images
by Andrea Bolognani 18 Jun '18

18 Jun '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Note that this document will be displayed both for the repository containing the Dockerfiles https://github.com/libvirt/libvirt-dockerfiles and for the images produced by said Dockerfiles, eg. https://hub.docker.com/r/libvirt/buildenv-centos-7/ so the language is intentionally vague at times. I believe I've achieved a decent balance between the needs of the two scenarios, but I'm of course totally open to feedback :) README.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/README.md b/README.md index a84caf3..ccd7ad1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,52 @@ Docker-based build environments for libvirt =========================================== + +These images come with all libvirt build dependencies, including +optional ones, already installed: this makes it possible to run +something like + + $ docker run \ + -v $(pwd):/libvirt \ + -w /libvirt \ + -it \ + buildenv-centos-7 + +from a git clone and start building libvirt right away. + +Image availability is influenced by libvirt's +[platform support policy](https://libvirt.org/platforms.html), +with the obvious caveat that non-Linux operating systems can't +be run on top of a Linux kernel and as such are not included. + + +Intended use +------------ + +The images are primarily intended for use on +[Travis CI](https://travis-ci.org/libvirt/libvirt). + +The primary CI environment for the libvirt project is hosted on +[CentOS CI](https://ci.centos.org/view/libvirt/); however, since +that environment feeds off the `master` branch of the various +projects, it can only detect issues after the code causing them +has already been merged. + +While testing on Travis CI doesn't cover as many platforms or the +interactions between as many components, it can be very useful as +a smoke test of sorts that allows developers to catch mistakes +before posting patches to the mailing list. + +As an alternative, images can be used locally without relying on +third-party services; in this scenario, the number of platforms +patches are tested against is only limited by image availability +and hardware resources. + + +Information about build dependencies +------------------------------------ + +The list of build dependencies for libvirt (as well as many +other virtualization-related projects) is taken from the +[libvirt-jenkins-ci](https://libvirt.org/git/?p=libvirt-jenkins-ci.git) +repository, which also contains the tooling used to generate +Dockerfiles. -- 2.17.1

2 1

[libvirt] [PATCH v2 0/3] qemu: Allow concurrent access to monitor and guest agent
by Michal Privoznik 18 Jun '18

18 Jun '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-June/msg00700.html diff to v1: - extended THREADS.txt documentation - added more comments - merged 3/4 to 1/4 in original patch set (I think that's everything that was pointed out in John's review) Michal Privoznik (3): qemu: Introduce qemuDomainAgentJob qemu: Introduce APIs for manipulating qemuDomainAgentJob qemu: Switch code to use new agent job APIs src/qemu/THREADS.txt | 112 ++++++++++++++++++++++++++--- src/qemu/qemu_domain.c | 191 ++++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_domain.h | 30 ++++++++ src/qemu/qemu_driver.c | 91 ++++++++++++++--------- 4 files changed, 345 insertions(+), 79 deletions(-) -- 2.16.4

1 3

[libvirt] [PATCH] events: Remove ATTRIBUTE_NONNULL for virObjectEventStateQueue[Remote]
by John Ferlan 18 Jun '18

18 Jun '18

Commit aad3a0b5f altered virObjectEventStateQueueRemote to move the "if (!event) return" call added in the previous commit 031eb8f6 to virObjectEventStateQueue. Neither commit altered the function prototype which used ATTRIBUTE_NONNULL(2). This caused Coverity build problems. Since @event is now checked, just remove the ATTRIBUTE_NONNULL check from both prototypes. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/object_event.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Although a Coverity build breaker, that doesn't affect everyone so I'll wait for R-By or ACK for push. diff --git a/src/conf/object_event.h b/src/conf/object_event.h index 133f7ed914..70e9579e81 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -62,13 +62,13 @@ typedef void (*virConnectObjectEventGenericCallback)(virConnectPtr conn, void virObjectEventStateQueue(virObjectEventStatePtr state, virObjectEventPtr event) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); void virObjectEventStateQueueRemote(virObjectEventStatePtr state, virObjectEventPtr event, int remoteID) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); int virObjectEventStateDeregisterID(virConnectPtr conn, -- 2.14.4

2 1

[libvirt] [libvirt-go PATCH 0/2] Add bindings for recent libvirt SEV APIs
by Erik Skultety 18 Jun '18

18 Jun '18

*** BLURB HERE *** Erik Skultety (2): Add support for AMD SEV launch security info Add support for AMD SEV platform info connect.go | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ connect_compat.go | 12 +++++++++++ connect_compat.h | 7 +++++++ domain.go | 41 ++++++++++++++++++++++++++++++++++++++ domain_compat.go | 13 ++++++++++++ domain_compat.h | 6 ++++++ 6 files changed, 138 insertions(+) -- 2.14.4

2 5