- Devel - libvirt List Archives

[libvirt] [PATCH] clarify the xml example for NVDIMM more clealy
by Luyao Zhong 30 Sep '19

30 Sep '19

The NVDIMM backend file can be a normal file or a real device file, Current xml example and explainations may mislead users. So add more info about the NVDIMM related elements and update the xml examples. Signed-off-by: Luyao Zhong <luyao.zhong(a)intel.com> --- docs/formatdomain.html.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 86a5261..556a39f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -8533,7 +8533,6 @@ qemu-kvm -net nic,model=? /dev/null <memory model='nvdimm'> <source> <path>/tmp/nvdimm</path> - <alignsize unit='KiB'>2048</alignsize> </source> <target> <size unit='KiB'>524288</size> @@ -8544,9 +8543,10 @@ qemu-kvm -net nic,model=? /dev/null <readonly/> </target> </memory> - <memory model='nvdimm'> + <memory model='nvdimm' access='shared'> <source> <path>/dev/dax0.0</path> + <alignsize unit='KiB'>2048</alignsize> <pmem/> </source> <target> @@ -8580,6 +8580,8 @@ qemu-kvm -net nic,model=? /dev/null module basis. Values are the same as <a href="#elementsMemoryBacking">Memory Backing</a>: <code>shared</code> and <code>private</code>. + For <code>nvdimm</code> model, if using real NVDIMM DAX device as + backend, <code>shared</code> is required. </p> </dd> @@ -8643,7 +8645,8 @@ qemu-kvm -net nic,model=? /dev/null alignment used to mmap the address range for the backend <code>path</code>. If not supplied the host page size is used. For example, to mmap a real NVDIMM device a 2M-aligned page may - be required. + be required, and host page size is 4KB, then we need to set this + element to 2MB. <span class="since">Since 5.0.0</span> </p> </dd> -- 2.7.4

2 1

[libvirt] [PATCH 0/4] Automatic lockable object unlocking
by Peter Krempa 30 Sep '19

30 Sep '19

A spin-off from the refactors to checkpoints where Eric suggested that we might want to replace virDomainObjEndAPI. See patch 2 for the implementation and patch 3 for example use. Peter Krempa (4): util: object: Note that VIR_AUTOUNREF variables must have the reference util: object: Add VIR_AUTOUNLOCK and VIR_AUTORELEASE qemu: driver: Convert qemuDomainGetInfo to use VIR_AUTORELEASE qemu: Don't repeat virDomainObjEndAPI in qemuDomainBlockPull src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 29 +++++++++++------------------ src/util/virobject.c | 29 +++++++++++++++++++++++++++++ src/util/virobject.h | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 75 insertions(+), 19 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH] security: AppArmor profile fixes for swtpm
by Chris Coulson 30 Sep '19

30 Sep '19

The AppArmor profile generated by virt-aa-helper is too strict for swtpm. This change contains 2 small fixes: - Relax append access to swtpm's log file to permit write access instead. Append access is insufficient because the log is opened with O_CREAT. - Permit swtpm to acquire a lock on its lock file. --- src/security/virt-aa-helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 326cfaf52a..3d7cc32459 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1238,10 +1238,10 @@ get_files(vahControl * ctl) * directory, log, and PID files. */ virBufferAsprintf(&buf, - " \"%s/lib/libvirt/swtpm/%s/%s/**\" rw,\n", + " \"%s/lib/libvirt/swtpm/%s/%s/**\" rwk,\n", LOCALSTATEDIR, uuidstr, tpmpath); virBufferAsprintf(&buf, - " \"%s/log/swtpm/libvirt/qemu/%s-swtpm.log\" a,\n", + " \"%s/log/swtpm/libvirt/qemu/%s-swtpm.log\" w,\n", LOCALSTATEDIR, ctl->def->name); virBufferAsprintf(&buf, " \"%s/libvirt/qemu/swtpm/%s-swtpm.pid\" rw,\n", -- 2.20.1

5 5

[libvirt] [PATCH v1 0/3] Adding the 'ccf-assist' pSeries capability
by Daniel Henrique Barboza 30 Sep '19

30 Sep '19

Hi, This short series exposes, implements and documents a pSeries guest capability called Count Cache Flush Assist (ccf-assist), which was added in the Linux kernel since 5.1 and in QEMU since 4.0.0. The reason why this capability needs to exposed via Libvirt is because it is defaulted to 'off' in QEMU to not break migration compatibility in the Power 9 processor class. However, there is a performance gain in activating it, thus the user might want to choose less migration options for more power. More details can be found in the commit message of patch 1. Daniel Henrique Barboza (3): qemu: Add capability for the ccf-assist pSeries feature qemu: Implement the ccf-assist pSeries feature news: Update for the ccf-assist pSeries feature docs/formatdomain.html.in | 9 +++++++++ docs/news.xml | 9 +++++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 +++++++++++++++++++ src/qemu/qemu_domain.c | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/pseries-features.args | 2 +- tests/qemuxml2argvdata/pseries-features.xml | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 1 + 15 files changed, 58 insertions(+), 1 deletion(-) -- 2.21.0

1 4

[libvirt] [PATCH] qemu: sanity check vhost user FD before passing to QEMU
by Daniel P. Berrangé 30 Sep '19

30 Sep '19

Ensure that the FD we're passing to QEMU is actually open, so we get a sane error message upfront instead of telling QEMU to use a closed FD. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 77470a6037..8c979fdf65 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4704,6 +4704,12 @@ qemuBuildVhostUserChardevStr(const char *alias, { char *chardev = NULL; + if (*fd == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Attempt to pass closed vhostuser FD")); + return NULL; + } + if (virAsprintf(&chardev, "socket,id=chr-vu-%s,fd=%d", alias, *fd) < 0) return NULL; -- 2.21.0

2 1

[libvirt] [PATCH v2] qemu: ensure vhostuser FD is initialized to -1
by Daniel P. Berrangé 30 Sep '19

30 Sep '19

The video private data was not initializing the vhostuser FD causing us to attempt to close FD 0 many times over. Fixes commit ca60ecfa8cc1bd85baf7137dd1864d5f00f019f0 Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> Date: Mon Sep 23 14:44:36 2019 +0400 qemu: add qemuDomainVideoPrivate Since the test suite does not invoke qemuExtDevicesStart(), no vhost_user_fd will be present when generating test XML. To deal with this we can must a fake FD number. While the current XML is using FD == 0, we pick a very interesting number that's unlikely to be a real FD, so that we're more likely to see any mistakes closing the invalid FD. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In v2: - Fix FD initialization in test suite src/qemu/qemu_domain.c | 2 ++ .../vhost-user-gpu-secondary.x86_64-latest.args | 4 ++-- .../qemuxml2argvdata/vhost-user-vga.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/virtio-options.args | 2 +- tests/qemuxml2argvtest.c | 10 ++++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e8e895d9aa..e2b78c2457 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1367,6 +1367,8 @@ qemuDomainVideoPrivateNew(void) if (!(priv = virObjectNew(qemuDomainVideoPrivateClass))) return NULL; + priv->vhost_user_fd = -1; + return (virObjectPtr) priv; } diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 58f49595e7..77643d31c0 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -31,8 +31,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ --chardev socket,id=chr-vu-video0,fd=0 \ --chardev socket,id=chr-vu-video1,fd=0 \ +-chardev socket,id=chr-vu-video0,fd=1729 \ +-chardev socket,id=chr-vu-video1,fd=1729 \ -device vhost-user-vga,id=video0,max_outputs=1,chardev=chr-vu-video0,bus=pci.0,\ addr=0x2 \ -device vhost-user-gpu-pci,id=video1,max_outputs=1,chardev=chr-vu-video1,\ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 6640d86fa5..dd5f9800d9 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ --chardev socket,id=chr-vu-video0,fd=0 \ +-chardev socket,id=chr-vu-video0,fd=1729 \ -device vhost-user-vga,id=video0,max_outputs=1,chardev=chr-vu-video0,bus=pci.0,\ addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/virtio-options.args b/tests/qemuxml2argvdata/virtio-options.args index 79216a5503..33ecd8f4e8 100644 --- a/tests/qemuxml2argvdata/virtio-options.args +++ b/tests/qemuxml2argvdata/virtio-options.args @@ -49,7 +49,7 @@ ats=on \ ats=on \ -device virtio-input-host-pci,id=input3,evdev=/dev/input/event1234,bus=pci.0,\ addr=0x12,iommu_platform=on,ats=on \ --chardev socket,id=chr-vu-video0,fd=0 \ +-chardev socket,id=chr-vu-video0,fd=1729 \ -device vhost-user-gpu-pci,id=video0,max_outputs=1,chardev=chr-vu-video0,\ bus=pci.0,addr=0x2,iommu_platform=on,ats=on \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0xc,iommu_platform=on,\ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5bbac1c8b8..5f4e87aa6d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -528,6 +528,16 @@ testCompareXMLToArgv(const void *data) } } + for (i = 0; i < vm->def->nvideos; i++) { + virDomainVideoDefPtr video = vm->def->videos[i]; + + if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) { + qemuDomainVideoPrivatePtr vpriv = QEMU_DOMAIN_VIDEO_PRIVATE(video); + + vpriv->vhost_user_fd = 1729; + } + } + if (flags & FLAG_SLIRP_HELPER) { for (i = 0; i < vm->def->nnets; i++) { virDomainNetDefPtr net = vm->def->nets[i]; -- 2.21.0

2 1

[libvirt] [PATCH] qemu: ensure vhostuser FD is initialized to -1
by Daniel P. Berrangé 30 Sep '19

30 Sep '19

The video private data was not initializing the vhostuser FD causing us to attempt to close FD 0 many times over. Fixes commit ca60ecfa8cc1bd85baf7137dd1864d5f00f019f0 Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> Date: Mon Sep 23 14:44:36 2019 +0400 qemu: add qemuDomainVideoPrivate Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bfd49beb21..bb81bda88e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1336,6 +1336,8 @@ qemuDomainVideoPrivateNew(void) if (!(priv = virObjectNew(qemuDomainVideoPrivateClass))) return NULL; + priv->vhost_user_fd = -1; + return (virObjectPtr) priv; } -- 2.21.0

2 2

[libvirt] [PATCH 0/5] Couple of NSS fixes
by Michal Privoznik 30 Sep '19

30 Sep '19

I'm trying to develop gethostbyaddr() and meanwhile I've noticed couple of almost trivial patches. Michal Prívozník (5): nss: Compare addresses iff their family matches nss: Drop needless free() in gethostbyname3() nss: Don't leak @addr in gethostbyname4() libvirt_nss.h: Separate function declarations with an empty line tools: Record NSS dependency on symbols file tools/Makefile.am | 8 ++++++++ tools/nss/libvirt_nss.c | 4 +--- tools/nss/libvirt_nss.h | 2 ++ tools/nss/libvirt_nss_leases.c | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) -- 2.21.0

2 10

[libvirt] [PATCH] qemu: checkpoint: Do ACL check prior to snapshot interlocking
by Peter Krempa 30 Sep '19

30 Sep '19

The interlocking with snapshots is executed prior to the ACL check so if a VM has snapshots invoking the checkpoint API may leak it's existance. Introduced with the qemuDomainCheckpointCreateXML API implementation in commit 5f4e0796503. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Split out from the checkpoint refactor series as I didn't notice this one originally. src/qemu/qemu_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d5f5fd6990..3b2eb30606 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17283,18 +17283,18 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain, if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - if (virDomainSnapshotObjListNum(vm->snapshots, NULL, 0) > 0) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cannot create checkpoint while snapshot exists")); - goto cleanup; - } - priv = vm->privateData; cfg = virQEMUDriverGetConfig(driver); if (virDomainCheckpointCreateXMLEnsureACL(domain->conn, vm->def, flags) < 0) goto cleanup; + if (virDomainSnapshotObjListNum(vm->snapshots, NULL, 0) > 0) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot create checkpoint while snapshot exists")); + goto cleanup; + } + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BITMAP_MERGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("qemu binary lacks persistent bitmaps support")); -- 2.21.0

2 1

[libvirt] [PATCH] qemu: make attaching disk partition to VM illegal
by Pavel Mores 30 Sep '19

30 Sep '19

The way in which the qemu driver generates aliases for disks involves ignoring the partition number part of a target dev name. This means that all partitions of a block device and the device itself all end up with the same alias. If multiple such disks are specified in XML, the resulting name clash makes qemu invocation fail. Since attaching partitions to qemu VMs doesn't seem to make much sense anyway, disallow partitions in target specifications altogether. https://bugzilla.redhat.com/show_bug.cgi?id=1346265 Signed-off-by: Pavel Mores <pmores(a)redhat.com> --- src/qemu/qemu_domain.c | 10 +++++++ .../disk-attaching-partition-invalid.xml | 27 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-attaching-partition-invalid.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e8e895d9aa..d03f3bed5f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5880,6 +5880,8 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk, { const char *driverName = virDomainDiskGetDriver(disk); virStorageSourcePtr n; + int idx; + int partition; if (disk->src->shared && !disk->src->readonly && !qemuBlockStorageSourceSupportsConcurrentAccess(disk->src)) { @@ -5948,6 +5950,14 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk, return -1; } + int result = virDiskNameParse(disk->dst, &idx, &partition); + if (result != 0 || partition != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("can't attach disk partition '%s', please attach whole disk instead"), + disk->dst); + return -1; + } + for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { if (qemuDomainValidateStorageSource(n, qemuCaps) < 0) return -1; diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-invalid.xml b/tests/qemuxml2argvdata/disk-attaching-partition-invalid.xml new file mode 100644 index 0000000000..591819fbb6 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-attaching-partition-invalid.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='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> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/export/vmimages/1.raw'/> + <target dev='vdb1' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5bbac1c8b8..b54b4bbf35 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1097,6 +1097,7 @@ mymain(void) DO_TEST("disk-no-boot", NONE); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-invalid"); DO_TEST_FAILURE("disk-usb-nosupport", NONE); DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE); -- 2.21.0

3 3