- Devel - libvirt List Archives

[libvirt] [PATCH v2 00/16] Add vhost-user-gpu support
by Cole Robinson 30 Aug '19

30 Aug '19

v1: https://www.redhat.com/archives/libvir-list/2019-June/msg00102.html This is v2 of Marc-André's series with minor changes. I'm not taking over this series, I just fixed these as part of the patch rebase so I can review it :) Changes since v1: - rebase to master - if test file build by dropping LDADDS usage - syntax-check issues: * use #pragma once * if () bracket issues * jump label indent issues * error message %s usage * size_t for loops I didn't know much about vhost-user-gpu before this series, here's what I've learned. vhost-user is a generic mechanism that allows implementing virtio device dataplane handling in a separate userspace process. vhost-user-gpu here notably moves the virgl 3d handling out of the main qemu process. The external process will be /usr/libexec/vhost-user-gpu, which comes from qemu.git contrib/vhost-user-gpu code, first released in qemu-4.1. Part of this series deals with discovering the location on disk of the vhost-user-gpu binary, and what capabilities it provides. This uses a similar mechanism to firmware.json, described in qemu docs/interop/vhost-user.json https://github.com/qemu/qemu/blob/master/docs/interop/vhost-user.json qemu 4.1 ships a 50-qemu-gpu.json to match. I believe virtio-fs will use a similar mechanism when it lands in upstream qemu, as virtiofsd is a separate process that communicates with qemu over vhost-user. For a bit more background on vhost-user-gpu process handling and the json interop motivation, here's some of the qemu discussion: https://lists.nongnu.org/archive/html/qemu-devel/2018-08/msg02610.html https://lists.nongnu.org/archive/html/qemu-devel/2018-09/msg00807.html For this series, the XML to enable this is: <video model='virtio' vhostuser='yes'> <acceleration accel3d='yes' rendernode='/path/to/rendernode'/> </video> rendernode is optional qemu_vhost_user.c handles vhost-user.json qemu_vhost_user_gpu.c handles the process management for vhost-user-gpu Marc-André Lureau (16): qemu: extract out qemuFetchConfigs from firmware domain: add "vhostuser" attribute to virtio video model domain: add rendernode attribute on <accel> qemu-cgroup: allow accel rendernode access qemu: add vhost-user-gpu capabilities checks qemu: check that qemu is vhost-user-vga capable qemu: validate virtio-gpu with vhost-user qemu: restrict 'virgl=' option to non-vhostuser video type qemu: add vhost-user helpers qemu: add qemuSecurityStartVhostUserGPU helper qemu: add vhost-user-gpu helper unit qemu: prepare domain for vhost-user GPU qemu: start/stop the vhost-user-gpu external device qemu: build vhost-user GPU devices tests: mock execv/execve tests: add vhost-user-gpu xml2argv tests docs/formatdomain.html.in | 11 + docs/schemas/domaincommon.rng | 16 +- src/conf/device_conf.c | 1 + src/conf/device_conf.h | 2 + src/conf/domain_conf.c | 32 +- src/conf/domain_conf.h | 2 + src/qemu/Makefile.inc.am | 6 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 24 ++ src/qemu/qemu_command.c | 54 ++- src/qemu/qemu_configs.c | 183 ++++++++ src/qemu/qemu_configs.h | 28 ++ src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_extdevice.c | 75 +++- src/qemu/qemu_extdevice.h | 5 + src/qemu/qemu_firmware.c | 144 +------ src/qemu/qemu_process.c | 18 +- src/qemu/qemu_security.c | 47 +++ src/qemu/qemu_security.h | 6 + src/qemu/qemu_vhost_user.c | 394 ++++++++++++++++++ src/qemu/qemu_vhost_user.h | 48 +++ src/qemu/qemu_vhost_user_gpu.c | 305 ++++++++++++++ src/qemu/qemu_vhost_user_gpu.h | 50 +++ tests/Makefile.am | 9 + .../caps_4.1.0.x86_64.xml | 2 + .../etc/qemu/vhost-user/40-gpu.json | 1 + .../etc/qemu/vhost-user/50-gpu.json | 0 .../qemu/vhost-user/test-vhost-user-gpu | 11 + .../usr/share/qemu/vhost-user/30-gpu.json | 1 + .../usr/share/qemu/vhost-user/50-gpu.json | 8 + .../usr/share/qemu/vhost-user/60-gpu.json | 1 + tests/qemuvhostusertest.c | 132 ++++++ .../vhost-user-gpu-secondary.args | 38 ++ .../vhost-user-gpu-secondary.xml | 44 ++ tests/qemuxml2argvdata/vhost-user-vga.args | 35 ++ tests/qemuxml2argvdata/vhost-user-vga.xml | 41 ++ tests/qemuxml2argvtest.c | 21 + tests/virfilewrapper.c | 22 + 39 files changed, 1676 insertions(+), 158 deletions(-) create mode 100644 src/qemu/qemu_configs.c create mode 100644 src/qemu/qemu_configs.h create mode 100644 src/qemu/qemu_vhost_user.c create mode 100644 src/qemu/qemu_vhost_user.h create mode 100644 src/qemu/qemu_vhost_user_gpu.c create mode 100644 src/qemu/qemu_vhost_user_gpu.h create mode 120000 tests/qemuvhostuserdata/etc/qemu/vhost-user/40-gpu.json create mode 100644 tests/qemuvhostuserdata/etc/qemu/vhost-user/50-gpu.json create mode 100755 tests/qemuvhostuserdata/usr/libexec/qemu/vhost-user/test-vhost-user-gpu create mode 120000 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/30-gpu.json create mode 100644 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/50-gpu.json create mode 120000 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/60-gpu.json create mode 100644 tests/qemuvhostusertest.c create mode 100644 tests/qemuxml2argvdata/vhost-user-gpu-secondary.args create mode 100644 tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-vga.args create mode 100644 tests/qemuxml2argvdata/vhost-user-vga.xml -- 2.21.0

3 44

[libvirt] [PATCH 0/3] qemu: Fix formatting of (some) unsigned long long values to JSON (blockdev-add saga)
by Peter Krempa 30 Aug '19

30 Aug '19

Currently, libvirt would regress to computer-middle-ages by not being able to use more than 4GiB images for snapshots without corrupting data. Fix it by using the proper formatting modifier. Peter Krempa (3): qemu: block: Use correct type when creating image size JSON entries tests: qemublock: Use bigger numbers as dummy capacity/physical qemu: monitor: Fix formatting of 'offset' in qemuMonitorJSONSaveMemory src/qemu/qemu_block.c | 12 ++++++------ src/qemu/qemu_monitor_json.c | 2 +- tests/qemublocktest.c | 4 ++-- .../qemublocktestdata/imagecreate/luks-encopts.json | 4 ++-- tests/qemublocktestdata/imagecreate/luks-noopts.json | 4 ++-- .../imagecreate/network-gluster-qcow2.json | 4 ++-- .../imagecreate/network-rbd-qcow2.json | 4 ++-- .../imagecreate/network-sheepdog-qcow2.json | 4 ++-- .../imagecreate/network-ssh-qcow2.json | 4 ++-- .../imagecreate/qcow2-backing-luks.json | 4 ++-- .../imagecreate/qcow2-backing-raw-nbd.json | 4 ++-- .../imagecreate/qcow2-backing-raw.json | 4 ++-- .../imagecreate/qcow2-luks-encopts-backing.json | 4 ++-- .../imagecreate/qcow2-luks-encopts.json | 4 ++-- .../imagecreate/qcow2-luks-noopts.json | 4 ++-- tests/qemublocktestdata/imagecreate/qcow2.json | 4 ++-- tests/qemublocktestdata/imagecreate/raw.json | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -- 2.21.0

3 8

[libvirt] [PATCH for 5.7.0 v2 0/3] qemu_blockjob: Remove secdriver metadata more frequently
by Michal Privoznik 30 Aug '19

30 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-August/msg01418.html Patches 1/3 and 2/3 were ACKed but I did not pushed them yet - I'd like to push these all at once. diff to v1: - Instead of restoring seclabels on the backing chain, remove the metadata as we can't know if somebody else is not using some parts of the chain. Michal Prívozník (3): qemu_blockjob: Move active commit failed state handling into a function qemu_blockjob: Print image path on failed security metadata move too qemu_blockjob: Remove secdriver metadata more frequently src/qemu/qemu_blockjob.c | 78 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH for 5.7.0 0/3] qemu_blockjob: Restore seclabels more frequently
by Michal Privoznik 30 Aug '19

30 Aug '19

At some points in blockjob code we were not restoring seclabels on backing chain qemu deceased to use. This leads to perms/XATTRs leak problem. Michal Prívozník (3): qemu_blockjob: Move active commit failed state handling into a function qemu_blockjob: Print image path on failed security metadata move too qemu_blockjob: Restore seclabels more frequently on job events src/qemu/qemu_blockjob.c | 46 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH] vircgroupv2: fix abort in VIR_AUTOFREE
by Pavel Hrdina 30 Aug '19

30 Aug '19

Introduced by commit <c854e0bd33c7a5afb04a36465bf04f861b2efef5> that tried to fix an issue where we would fail to parse values from files. We cannot change the original pointer that is going to be used by VIR_AUTOFREE. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1747440 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Sigh, shame on me! src/util/vircgroupv2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index c62ee0d933..2aca4e5d62 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -849,6 +849,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group, VIR_AUTOFREE(char *) path = NULL; VIR_AUTOFREE(char *) str = NULL; VIR_AUTOFREE(char *) value = NULL; + char *tmp; if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "io.weight", &path) < 0) { @@ -869,7 +870,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group, if (!str) { *weight = 0; - } else if (virStrToLong_ui(str, &str, 10, weight) < 0) { + } else if (virStrToLong_ui(str, &tmp, 10, weight) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse '%s' as an integer"), str); @@ -1576,6 +1577,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota) { VIR_AUTOFREE(char *) str = NULL; + char *tmp; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", &str) < 0) { @@ -1587,7 +1589,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, return 0; } - if (virStrToLong_ll(str, &str, 10, cfs_quota) < 0) { + if (virStrToLong_ll(str, &tmp, 10, cfs_quota) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse value '%s' from cpu.max."), str); return -1; -- 2.21.0

2 1

[libvirt] [PATCH v1 0/3] unplug timeout QEMU configuration
by Daniel Henrique Barboza 30 Aug '19

30 Aug '19

At this moment, the unplug timeout Libvirt uses is 5 seconds. Which is good enough for most cases, but can be troublesome for cases in which it is not enough. For example, PowerPC guests with lots of vcpus can experience the 'vcpu unplug request timed out' message depending on the guest workload. What happens is that the user doesn't know if there was a problem in the unplug operation in QEMU, or the process took a bit longer than 5 seconds and Libvirt timed out, with QEMU carrying on the unplug operation regardless. This series implements a new 'unplug_timeout' attribute to allow the user to set this parameter, allowing users to set bigger timeouts, if so they choose. The existing 5 seconds timeout is the default value if the attribute isn't set. 5 seconds is also the minimal timeout allowed. Daniel Henrique Barboza (3): adding unplug_timeout QEMU conf qemu_hotplug: use qemu_driver->unplugTimeout in device removal qemu: Remove qemu_hotplugpriv.h src/qemu/Makefile.inc.am | 1 - src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 4 ++++ src/qemu/qemu_conf.c | 26 ++++++++++++++++++++++++ src/qemu/qemu_conf.h | 5 +++++ src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_hotplug.c | 15 +++++--------- src/qemu/qemu_hotplugpriv.h | 32 ------------------------------ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemuhotplugtest.c | 3 +-- 10 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 src/qemu/qemu_hotplugpriv.h -- 2.21.0

4 10

[libvirt] [PATCH trivial] qemu_conf.c: removing unused virQEMUDriverConfigPtr variable
by Daniel Henrique Barboza 30 Aug '19

30 Aug '19

'virQEMUDriverConfigPtr cfg' is declared, initiated, but never used in virQEMUDriverCreateCapabilities(). Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Accidental discovery while reading code. src/qemu/qemu_conf.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 89c183e46a..d771bb6916 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1266,7 +1266,6 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) virSecurityManagerPtr *sec_managers = NULL; /* Security driver data */ const char *doi, *model, *lbl, *type; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const int virtTypes[] = {VIR_DOMAIN_VIRT_KVM, VIR_DOMAIN_VIRT_QEMU,}; @@ -1313,13 +1312,11 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) } VIR_FREE(sec_managers); - virObjectUnref(cfg); return caps; error: VIR_FREE(sec_managers); virObjectUnref(caps); - virObjectUnref(cfg); return NULL; } -- 2.21.0

3 2

[libvirt] [PATCH 0/6] security_selinux: Don't store XATTRs if FS fakes SELinux
by Michal Privoznik 30 Aug '19

30 Aug '19

For full explanation see 6/6, but here's a digest: GlusterFS via FUSE supports XATTRs but doesn't allow any SELinux label change (which is fortunate for us because migrations work at least). However, we need to treat this situation as "don't remember any seclabels" because if the source sets XATTRs and the migration destination tries to set different label this fails. Michal Prívozník (6): virSecuritySELinuxGetProcessLabel: Fix comment virSecuritySELinuxSetFileconImpl: Drop @optional argument security_selinux: DropvirSecuritySELinuxSetFileconOptional() security_selinux: Drop @optional from _virSecuritySELinuxContextItem security_selinux: Drop virSecuritySELinuxSetFileconHelper security_selinux: Play nicely with network FS that only emulates SELinux src/security/security_selinux.c | 141 ++++++++++++++++---------------- 1 file changed, 70 insertions(+), 71 deletions(-) -- 2.21.0

2 16

[libvirt] [PATCH] qemu: use 'bochs' video type by default for UEFI domains
by Jonathon Jongsma 30 Aug '19

30 Aug '19

The 'bochs' video device doesn't have any legacy vga emulation so the attack surface is much lower. It works with OVMF, so UEFI guests should not see any functional difference to VGA. https://bugzilla.redhat.com/show_bug.cgi?id=1707119 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NOTE: You may run into an error when trying to use the bochs video device. For example: error: internal error: process exited while connecting to monitor: 2019-08-28T21:32:20.134546Z qemu-system-x86_64: -device bochs-display,id=video0,vgamem=16384k,bus=pcie.0,addr=0x1: failed to find romfile "vgabios-bochs-display.bin" This should be solved in e.g. Fedora 31 with newer releases of seabios/qemu. As a temporary workaround, you can symlink the appropriate vgabios file under /usr/share/qemu/. src/qemu/qemu_domain.c | 19 +++++---- src/qemu/qemu_domain.h | 1 + .../video-default-nouefi.x86_64-latest.args | 36 +++++++++++++++++ .../qemuxml2argvdata/video-default-nouefi.xml | 20 ++++++++++ .../video-default-uefi.x86_64-latest.args | 40 +++++++++++++++++++ tests/qemuxml2argvdata/video-default-uefi.xml | 22 ++++++++++ tests/qemuxml2argvtest.c | 2 + 7 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-default-nouefi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-default-nouefi.xml create mode 100644 tests/qemuxml2argvdata/video-default-uefi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-default-uefi.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4998474dc9..7ecb89ac84 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4584,6 +4584,14 @@ qemuDomainValidateCpuCount(const virDomainDef *def, } +static bool +qemuDomainDefIsUEFI(const virDomainDef *def) +{ + return ((def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI || + (def->os.loader && def->os.loader->type == + VIR_DOMAIN_LOADER_TYPE_PFLASH))); +} + static int qemuDomainDefValidate(const virDomainDef *def, virCapsPtr caps ATTRIBUTE_UNUSED, @@ -4606,10 +4614,7 @@ qemuDomainDefValidate(const virDomainDef *def, } /* On x86, UEFI requires ACPI */ - if ((def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI || - (def->os.loader && - def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH)) && - ARCH_IS_X86(def->os.arch) && + if (qemuDomainDefIsUEFI(def) && ARCH_IS_X86(def->os.arch) && def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("UEFI requires ACPI on this architecture")); @@ -4619,9 +4624,7 @@ qemuDomainDefValidate(const virDomainDef *def, /* On aarch64, ACPI requires UEFI */ if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON && def->os.arch == VIR_ARCH_AARCH64 && - (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI && - (!def->os.loader || - def->os.loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH))) { + !qemuDomainDefIsUEFI(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ACPI requires UEFI on this architecture")); goto cleanup; @@ -7452,6 +7455,8 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, qemuDomainIsRISCVVirt(def) || ARCH_IS_S390(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; + else if (qemuDomainDefIsUEFI(def)) + video->type = VIR_DOMAIN_VIDEO_TYPE_BOCHS; else video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 37a00323a7..c6deab1c52 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -923,6 +923,7 @@ bool qemuDomainHasBuiltinIDE(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def); bool qemuDomainSupportsPCI(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); +bool qemuDomainIsUEFI(const virDomainDef *def); void qemuDomainUpdateCurrentMemorySize(virDomainObjPtr vm); diff --git a/tests/qemuxml2argvdata/video-default-nouefi.x86_64-latest.args b/tests/qemuxml2argvdata/video-default-nouefi.x86_64-latest.args new file mode 100644 index 0000000000..f0c9e36594 --- /dev/null +++ b/tests/qemuxml2argvdata/video-default-nouefi.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-guest/master-key.aes \ +-machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-cpu Haswell \ +-m 1024 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 26b73eb7-f8c4-4541-ae6f-06607a1b21c3 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,\ +multifunction=on,addr=0x2 \ +-device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \ +-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \ +-device cirrus-vga,id=video0,bus=pcie.0,addr=0x1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/video-default-nouefi.xml b/tests/qemuxml2argvdata/video-default-nouefi.xml new file mode 100644 index 0000000000..7db2bedf6c --- /dev/null +++ b/tests/qemuxml2argvdata/video-default-nouefi.xml @@ -0,0 +1,20 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>26b73eb7-f8c4-4541-ae6f-06607a1b21c3</uuid> + <memory unit='KiB'>1048576</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + </os> + <features> + <acpi/> + </features> + <cpu mode='custom'> + <model>Haswell</model> + </cpu> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <memballoon model='none'/> + <video/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/video-default-uefi.x86_64-latest.args b/tests/qemuxml2argvdata/video-default-uefi.x86_64-latest.args new file mode 100644 index 0000000000..75c599f321 --- /dev/null +++ b/tests/qemuxml2argvdata/video-default-uefi.x86_64-latest.args @@ -0,0 +1,40 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-guest/master-key.aes \ +-machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-cpu Haswell \ +-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,\ +readonly=on \ +-drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,\ +unit=1 \ +-m 1024 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 26b73eb7-f8c4-4541-ae6f-06607a1b21c3 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,\ +multifunction=on,addr=0x2 \ +-device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \ +-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \ +-device bochs-display,id=video0,vgamem=16384k,bus=pcie.0,addr=0x1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/video-default-uefi.xml b/tests/qemuxml2argvdata/video-default-uefi.xml new file mode 100644 index 0000000000..59e880c78c --- /dev/null +++ b/tests/qemuxml2argvdata/video-default-uefi.xml @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>26b73eb7-f8c4-4541-ae6f-06607a1b21c3</uuid> + <memory unit='KiB'>1048576</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> + <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + </os> + <features> + <acpi/> + </features> + <cpu mode='custom'> + <model>Haswell</model> + </cpu> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <memballoon model='none'/> + <video/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9395cc19a2..671e79e631 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2045,6 +2045,8 @@ mymain(void) DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); + DO_TEST_CAPS_LATEST("video-default-uefi"); + DO_TEST_CAPS_LATEST("video-default-nouefi"); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE_VIRTIO_RNG, -- 2.21.0

6 6

[libvirt] [ocaml PATCH 0/4] Minor cleanups/fixes
by Pino Toscano 29 Aug '19

29 Aug '19

Small cleanups in the build system, no changes in the code/binding. Pino Toscano (4): build: stop generating a config.h build: drop broken NSIS leftovers build: remove manual OCaml dependencies build: remove the list_secrets binary on clean .gitignore | 2 -- MANIFEST | 1 - Makefile.in | 26 ++------------------------ configure.ac | 1 - libvirt/Makefile.in | 6 ------ libvirt/generator.pl | 2 -- 6 files changed, 2 insertions(+), 36 deletions(-) -- 2.21.0

2 7

[libvirt] Rust, new release v0.2.11
by Sahid Orentino Ferdjaoui 29 Aug '19

29 Aug '19

Just A small note to indicate that a new release v0.2.11 has been published. https://docs.rs/virt/0.2.11/virt/ Thanks to Sage Imel for its contribution to a bug fix: e737a93 virDomainGetAutostart takes a pointer that it writes the output value to s.

1 0

[libvirt] [PATCH] qemu: extract function qemuDomainDefIsUEFI()
by Jonathon Jongsma 29 Aug '19

29 Aug '19

Rather than repeating the conditions in a couple places, extract it into a separate function for detecting whether a domain definition uses UEFI. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- As requested by Andrea, I've extracted this little bit of refactoring from my bochs display patch and am sending it separately. src/qemu/qemu_domain.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4998474dc9..ed4b5c666d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4584,6 +4584,14 @@ qemuDomainValidateCpuCount(const virDomainDef *def, } +static bool +qemuDomainDefIsUEFI(const virDomainDef *def) +{ + return ((def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI || + (def->os.loader && def->os.loader->type == + VIR_DOMAIN_LOADER_TYPE_PFLASH))); +} + static int qemuDomainDefValidate(const virDomainDef *def, virCapsPtr caps ATTRIBUTE_UNUSED, @@ -4606,10 +4614,7 @@ qemuDomainDefValidate(const virDomainDef *def, } /* On x86, UEFI requires ACPI */ - if ((def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI || - (def->os.loader && - def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH)) && - ARCH_IS_X86(def->os.arch) && + if (qemuDomainDefIsUEFI(def) && ARCH_IS_X86(def->os.arch) && def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("UEFI requires ACPI on this architecture")); @@ -4619,9 +4624,7 @@ qemuDomainDefValidate(const virDomainDef *def, /* On aarch64, ACPI requires UEFI */ if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON && def->os.arch == VIR_ARCH_AARCH64 && - (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI && - (!def->os.loader || - def->os.loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH))) { + !qemuDomainDefIsUEFI(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ACPI requires UEFI on this architecture")); goto cleanup; -- 2.21.0

2 1

[libvirt] [PATCH REPOST] Revert "lxc: Try harder to stop/reboot containers"
by Daniel P. Berrangé 29 Aug '19

29 Aug '19

This reverts commit 14b6a1854fb4c02c5fb2f51679f8ff099f28f53c. If virLXCDomainSetRunlevel returns -1 this indicates a serious error / failure that must be propagated to the caller. We must not carry on with other shutdown methods in this case. If virLXCDomainSetRunlevel return 0, this indicates that no initctl was found and it is thus reasonable to fallback to sending SIGTERM. The commit being reverted is broken because it would fallback to SIGTERM when virLXCDomainSetRunlevel returns -1, and would not fallback when virLXCDomainSetRunlevel returns 0. ie it did the exact opposite of what was required. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/lxc/lxc_driver.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 5453f49064..ca0090de59 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3271,7 +3271,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, virLXCDomainObjPrivatePtr priv; virDomainObjPtr vm; int ret = -1; - int rc = -1; + int rc; virCheckFlags(VIR_DOMAIN_SHUTDOWN_INITCTL | VIR_DOMAIN_SHUTDOWN_SIGNAL, -1); @@ -3300,17 +3300,19 @@ lxcDomainShutdownFlags(virDomainPtr dom, (flags & VIR_DOMAIN_SHUTDOWN_INITCTL)) { int command = VIR_INITCTL_RUNLEVEL_POWEROFF; - if ((rc = virLXCDomainSetRunlevel(vm, command)) < 0) { - if (flags != 0 && - (flags & VIR_DOMAIN_SHUTDOWN_INITCTL)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Container does not provide an initctl pipe")); - goto endjob; - } + if ((rc = virLXCDomainSetRunlevel(vm, command)) < 0) + goto endjob; + if (rc == 0 && flags != 0 && + ((flags & ~VIR_DOMAIN_SHUTDOWN_INITCTL) == 0)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Container does not provide an initctl pipe")); + goto endjob; } + } else { + rc = 0; } - if (rc < 0 && + if (rc == 0 && (flags == 0 || (flags & VIR_DOMAIN_SHUTDOWN_SIGNAL))) { if (kill(priv->initpid, SIGTERM) < 0 && @@ -3347,7 +3349,7 @@ lxcDomainReboot(virDomainPtr dom, virLXCDomainObjPrivatePtr priv; virDomainObjPtr vm; int ret = -1; - int rc = -1; + int rc; virCheckFlags(VIR_DOMAIN_REBOOT_INITCTL | VIR_DOMAIN_REBOOT_SIGNAL, -1); @@ -3376,17 +3378,19 @@ lxcDomainReboot(virDomainPtr dom, (flags & VIR_DOMAIN_REBOOT_INITCTL)) { int command = VIR_INITCTL_RUNLEVEL_REBOOT; - if ((rc = virLXCDomainSetRunlevel(vm, command)) < 0) { - if (flags != 0 && - (flags & VIR_DOMAIN_REBOOT_INITCTL)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Container does not provide an initctl pipe")); - goto endjob; - } + if ((rc = virLXCDomainSetRunlevel(vm, command)) < 0) + goto endjob; + if (rc == 0 && flags != 0 && + ((flags & ~VIR_DOMAIN_SHUTDOWN_INITCTL) == 0)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Container does not provide an initctl pipe")); + goto endjob; } + } else { + rc = 0; } - if (rc < 0 && + if (rc == 0 && (flags == 0 || (flags & VIR_DOMAIN_REBOOT_SIGNAL))) { if (kill(priv->initpid, SIGHUP) < 0 && -- 2.21.0

2 1

[libvirt] [PATCH] qemu: agent: fix potential leak in qemuAgentGetFSInfo()
by Jonathon Jongsma 29 Aug '19

29 Aug '19

On error paths, info_ret could potentially leak. Make sure it's freed. --- Thanks to John Ferlan for the catch. Apparently this got missed before the patch was merged src/qemu/qemu_agent.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c63db968c6..a4113460bd 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2208,6 +2208,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoFree(info_ret[i]); } VIR_FREE(agentinfo); + VIR_FREE(info_ret); return ret; } -- 2.21.0

2 3

[libvirt] [PATCH v2 0/9] qemu: Blockdevize external snapshot creation (blokcdev-add saga)
by Peter Krempa 29 Aug '19

29 Aug '19

Patches 1-5 of the original series were already pushed. Patches 1-3 of this series are new and deal with fixing of a image locking bug which was added during the blockdev-add saga as we've changed the handling of the 'readonly' flag of an image. Patch 4 is new and should solve review feedback which complained about function naming. The rest of the series is almost exactly as in previous posting with following exceptions: 1) Review feedback incorporated and R-b's applied. 2) Patch 6/9 has a different summary 3) Patch 8/9 fixes a memory leak/crash as a part of the cleanup was misplaced out of the cleaning loop (while still using the 'i' to dereference arrays). 4) Conflicts with 4/9 resolved. Peter Krempa (9): qemu: snapshot: Fix image lock handling when taking a snapshot qemu: snapshot: Save status and config XMLs only on success qemu: snapshot: Move error preservation to qemuDomainSnapshotDiskDataCleanup qemu: snapshot: Rename external disk snapshot handling functions qemu: Disband qemuDomainSnapshotCreateSingleDiskActive qemu: Merge use of 'reuse' flag in qemuDomainSnapshotDiskPrepareOne qemu: snapshot: Skip overlay file creation/interogation if unsupported qemu: Add -blockdev support for external snapshots qemu: Defer support checks for external active snapshots to blockdev code or qemu src/qemu/qemu_driver.c | 276 +++++++++++++++++++++++++---------------- 1 file changed, 171 insertions(+), 105 deletions(-) -- 2.21.0

1 9

[libvirt] [PATCH 0/2] [for-5.7.0] qemu: Honor qemu's request to use all vCPU props
by Peter Krempa 29 Aug '19

29 Aug '19

qemu documents that we should pass in all fields of 'CpuInstanceProperties' back when hotplugging cpus, but we didn't do that. It turns out that qemu wanted to add new fields which were mandatory and thus broke the interop with libvirt. Let's honor their reques. Peter Krempa (2): qemu: Extract and store vCPU properties as qemu returned them qemu: command: Use all vCPU properties when creating args for vCPU hotplug src/qemu/qemu_command.c | 19 +++---------------- src/qemu/qemu_domain.c | 3 +++ src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_monitor.c | 2 ++ src/qemu/qemu_monitor.h | 6 ++++++ src/qemu/qemu_monitor_json.c | 4 ++++ .../x86-modern-bulk-monitor.json | 8 ++++---- .../x86-modern-individual-add-monitor.json | 4 ++-- 8 files changed, 27 insertions(+), 22 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH 1/1] security_util: verify xattrs only if ref is present
by Nikolay Shirokovskiy 29 Aug '19

29 Aug '19

After 7cfb7aab573 commit starting a domain pullutes logs with warnings like [1]. The reason is resource files do not have timestamp before starting a domain and after destroying domain the timestamp is cleared. Let's check the timestamp only if attribute with refcounter is found. [1] warning : virSecurityValidateTimestamp:198 : Invalid XATTR timestamp detected on \ /some/path secdriver=dac Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/security/security_util.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/security/security_util.c b/src/security/security_util.c index 31f41cedfd..f33fe9dd7b 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -269,13 +269,9 @@ virSecurityGetRememberedLabel(const char *name, VIR_AUTOFREE(char *) attr_name = NULL; VIR_AUTOFREE(char *) value = NULL; unsigned int refcount = 0; - int rc; *label = NULL; - if ((rc = virSecurityValidateTimestamp(name, path)) < 0) - return rc; - if (!(ref_name = virSecurityGetRefCountAttrName(name))) return -1; @@ -288,6 +284,14 @@ virSecurityGetRememberedLabel(const char *name, ref_name, path); return -1; + } else { + int rc; + + if ((rc = virSecurityValidateTimestamp(name, path)) < 0) + return rc; + + if (rc == 1) + return -2; } if (virStrToLong_ui(value, NULL, 10, &refcount) < 0) { @@ -357,10 +361,6 @@ virSecuritySetRememberedLabel(const char *name, VIR_AUTOFREE(char *) attr_name = NULL; VIR_AUTOFREE(char *) value = NULL; unsigned int refcount = 0; - int rc; - - if ((rc = virSecurityValidateTimestamp(name, path)) < 0) - return rc; if (!(ref_name = virSecurityGetRefCountAttrName(name))) return -1; @@ -375,6 +375,14 @@ virSecuritySetRememberedLabel(const char *name, path); return -1; } + } else { + int rc; + + if ((rc = virSecurityValidateTimestamp(name, path)) < 0) + return rc; + + if (rc == 1) + VIR_FREE(value); } if (value && -- 2.23.0

2 1

[libvirt] [PATCH] util: activate directory override when used from library
by Daniel P. Berrangé 29 Aug '19

29 Aug '19

The Perl bindings for libvirt use the test driver for unit tests. This tries to load the cpu_map/index.xml file, and when run from an uninstalled build will fail. The problem is that virFileActivateDirOverride is called by our various binaries like libvirtd, virsh, but is not called when a 3rd party app uses libvirt.so To deal with this we allow the LIBVIRT_DIR_OVERRIDE=1 env variable to be set and make virInitialize look for this. The 'run' script will set it, so now build using this script to run against an uninstalled tree we will correctly resolve files to the source tree. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- run.in | 3 +++ src/libvirt.c | 2 ++ src/util/virfile.c | 21 +++++++++++++-------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/run.in b/run.in index 9a1c6ea11a..de7af78f67 100644 --- a/run.in +++ b/run.in @@ -60,6 +60,9 @@ else fi export PKG_CONFIG_PATH +LIBVIRT_DIR_OVERRIDE=1 +export LIBVIRT_DIR_OVERRIDE + # This is a cheap way to find some use-after-free and uninitialized # read problems when using glibc. random_val="$(awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)" diff --git a/src/libvirt.c b/src/libvirt.c index 956ccdea30..6b1b4a54c3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -250,6 +250,8 @@ virGlobalInit(void) virErrorInitialize() < 0) goto error; + virFileActivateDirOverride(NULL); + if (getuid() != geteuid() || getgid() != getegid()) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/util/virfile.c b/src/util/virfile.c index 81a3c096eb..391b6a9e6e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1776,14 +1776,19 @@ virFileFindResource(const char *filename, void virFileActivateDirOverride(const char *argv0) { - char *file = strrchr(argv0, '/'); - if (!file || file[1] == '\0') - return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { - useDirOverride = true; - VIR_DEBUG("Activating build dir override for %s", argv0); + if (argv0 == NULL) { + if (getenv("LIBVIRT_DIR_OVERRIDE") != NULL) + useDirOverride = true; + } else { + char *file = strrchr(argv0, '/'); + if (!file || file[1] == '\0') + return; + file++; + if (STRPREFIX(file, "lt-") || + strstr(argv0, "/.libs/")) { + useDirOverride = true; + VIR_DEBUG("Activating build dir override for %s", argv0); + } } } -- 2.21.0

2 1

[libvirt] [python PATCH] Implement virDomainGetGuestInfo
by Michal Privoznik 29 Aug '19

29 Aug '19

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- generator.py | 1 + libvirt-override-api.xml | 7 +++++++ libvirt-override.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/generator.py b/generator.py index 8922f93..0b0a5a7 100755 --- a/generator.py +++ b/generator.py @@ -507,6 +507,7 @@ skip_impl = ( 'virNodeGetSEVInfo', 'virNetworkPortGetParameters', 'virNetworkPortSetParameters', + 'virDomainGetGuestInfo', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 9c4d71d..b2a6259 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -789,5 +789,12 @@ <arg name='port' type='virNetworkPortPtr' info='pointer to network port object'/> <arg name='flags' type='int' info='unused, always pass 0'/> </function> + <function name='virDomainGetGuestInfo' file='python'> + <info>Get aggregated info from guest agent</info> + <return type='char *' info='None in case of error, returns a dictionary of params'/> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='types' type='int' info='optional binary-OR of virDomainGuestInfoTypes'/> + <arg name='flags' type='int' info='unused, always pass 0'/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 42f8198..5567f4a 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -10176,6 +10176,39 @@ libvirt_virNetworkPortGetParameters(PyObject *self ATTRIBUTE_UNUSED, } #endif /* LIBVIR_CHECK_VERSION(5, 5, 0) */ +#if LIBVIR_CHECK_VERSION(5, 7, 0) +static PyObject * +libvirt_virDomainGetGuestInfo(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_dom = NULL; + PyObject *dict = NULL; + virDomainPtr dom = NULL; + virTypedParameterPtr params = NULL; + int nparams = 0; + unsigned int types; + unsigned int flags; + int rc; + + if (!PyArg_ParseTuple(args, (char *) "OII:virDomainGetGuestInfo", + &pyobj_dom, &types, &flags)) + return NULL; + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + rc = virDomainGetGuestInfo(dom, types, &params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (rc < 0) + return VIR_PY_NONE; + + dict = getPyVirTypedParameter(params, nparams); + + virTypedParamsFree(params, nparams); + return dict; +} +#endif /* LIBVIR_CHECK_VERSION(5, 7, 0) */ + /************************************************************************ * * * The registration stuff * @@ -10431,6 +10464,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNetworkPortSetParameters", libvirt_virNetworkPortSetParameters, METH_VARARGS, NULL}, {(char *) "virNetworkPortGetParameters", libvirt_virNetworkPortGetParameters, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(5, 5, 0) */ +#if LIBVIR_CHECK_VERSION(5, 7, 0) + {(char *) "virDomainGetGuestInfo", libvirt_virDomainGetGuestInfo, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(5, 7, 0) */ {NULL, NULL, 0, NULL} }; -- 2.21.0

2 1

[libvirt] [PATCH v3 0/9] add virDomainGetGuestInfo()
by Jonathon Jongsma 28 Aug '19

28 Aug '19

changes in v3: - fixed test failure - fixed syntax issues that I had missed since I forgot to install cppi on my new laptop This series adds several bits of guest information provided by a new API function virDomainGetGuestInfo(). There is an implementation for qemu using the guest agent. In particular, it adds information about logged-in users, guest OS, timezone, hostname, and filesystem info. Filesystem information is already accessible via the public API virDomainGetFSInfo(), but recent versions of the qemu guest agent added additional information, and the existing public API is not able to be extended without breaking API since it returns a C struct. This new API uses typed parameters so that it can be extended as necessary when new fields are added. The overall API follows the bulk stats API quite closely, and tries to return data in similar ways (for example, the "users.N.*" field name scheme was inspired by various stats fields). It should be noted that like version 1 of this patch series, the API still only operates on a single domain, not a list of domains. I'm willing to consider changing the API to operate on a list of domains if that is the concensus, but I lean toward keeping it simpler. Here's an example of the output of the virsh command added in this patch operating on a fedora 30 guest: virsh # guestinfo fedora30 user.count : 1 user.0.name : test user.0.login-time : 1566422940895 os.id : fedora os.name : Fedora os.pretty-name : Fedora 30 (Workstation Edition) os.version : 30 (Workstation Edition) os.version-id : 30 os.machine : x86_64 os.variant : Workstation Edition os.variant-id : workstation os.kernel-release : 5.2.7-200.fc30.x86_64 os.kernel-version : #1 SMP Thu Aug 8 05:35:29 UTC 2019 timezone.name : CDT timezone.offset : -18000 hostname : myhostname fs.count : 3 fs.0.name : dm-0 fs.0.mountpoint : / fs.0.fstype : ext4 fs.0.total-bytes : 25928306688 fs.0.used-bytes : 10762133504 fs.0.disk.count : 1 fs.0.disk.0.alias : vda fs.0.disk.0.serial : 947684ABZ8639Q fs.0.disk.0.device : /dev/vda2 fs.1.name : vda1 fs.1.mountpoint : /boot fs.1.fstype : ext4 fs.1.total-bytes : 952840192 fs.1.used-bytes : 229019648 fs.1.disk.count : 1 fs.1.disk.0.alias : vda fs.1.disk.0.serial : 947684ABZ8639Q fs.1.disk.0.device : /dev/vda1 fs.2.name : md127 fs.2.mountpoint : /run/media/test/971b1edc-da61-4015-b465-560a9b1b6e9b fs.2.fstype : ext4 fs.2.total-bytes : 1950134272 fs.2.used-bytes : 6291456 fs.2.disk.count : 2 fs.2.disk.0.alias : vdb fs.2.disk.0.device : /dev/vdb1 fs.2.disk.1.alias : vdc fs.2.disk.1.device : /dev/vdc1 In contrast, here is the output of the virsh command operating on a fedora24 guest: virsh # guestinfo fedora24 error: Reconnected to the hypervisor fs.count : 2 fs.0.name : dm-0 fs.0.mountpoint : / fs.0.fstype : ext4 fs.0.disk.count : 1 fs.0.disk.0.alias : vda fs.1.name : vda1 fs.1.mountpoint : /boot fs.1.fstype : ext4 fs.1.disk.count : 1 fs.1.disk.0.alias : vda However, if you specifically request an info category that is not supported by the guest agent: virsh # guestinfo --user fedora24 error: internal error: unable to execute QEMU agent command 'guest-get-users': The command guest-get-users has not been found Jonathon Jongsma (9): lib: add virDomainGetGuestInfo() remote: implement virDomainGetGuestInfo qemu: add helper for getting guest users qemu: add helper function for querying OS info qemu: add helper for querying timezone info qemu: add support for new fields in FSInfo qemu: add helper for getting full FSInfo qemu: Implement virDomainGetGuestInfo() virsh: add 'guestinfo' command include/libvirt/libvirt-domain.h | 14 + src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 117 ++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 483 ++++++++++++++++++++++- src/qemu/qemu_agent.h | 9 + src/qemu/qemu_driver.c | 110 ++++++ src/remote/remote_daemon_dispatch.c | 41 ++ src/remote/remote_driver.c | 53 +++ src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 12 + tests/qemuagenttest.c | 576 +++++++++++++++++++++++++++- tools/virsh-domain.c | 85 ++++ 13 files changed, 1495 insertions(+), 35 deletions(-) -- 2.21.0

5 35

[libvirt] [PATCH] news: Mention new --precopy-bandwidth parameter for virsh migrate
by Jim Fehlig 28 Aug '19

28 Aug '19

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c6580e4e72..990c84274d 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -65,6 +65,16 @@ </change> </section> <section title="Improvements"> + <change> + <summary> + virsh: Support setting precopy bandwidth in migrate subcommand + </summary> + <description> + In addition to postcopy bandwidth, the virsh migrate subcommand + now supports specifying precopy bandwidth with the + <code>--precopy-bandwidth</code> parameter. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.22.0

2 1

[libvirt] [PATCH] docs: Make anchors follow HTML5
by Michal Privoznik 28 Aug '19

28 Aug '19

According to HTML specification, <a name=''> works in HTML4, but <a id=''> works in both HTML4 and HTML5. This is followed even in docs/page.xsl where HTML bookmark links are generated only for those anchors which have @id attribute. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- For instance, ToC at the following page doesn't work: https://libvirt.org/hvsupport.html But after this patch the links are generated properly. docs/api_extension.html.in | 12 ++++++------ docs/dbus.html.in | 6 +++--- docs/devhelp/html.xsl | 16 ++++++++-------- docs/genaclperms.pl | 4 ++-- docs/hvsupport.pl | 2 +- docs/newapi.xsl | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 604c397c84..79e7913c1a 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -89,7 +89,7 @@ separately. </p> - <h2><a name='publicapi'>Defining the public API</a></h2> + <h2><a id='publicapi'>Defining the public API</a></h2> <p>The first task is to define the public API. If the new API involves an XML extension, you have to enhance the RelaxNG @@ -119,7 +119,7 @@ rework it as you go through the process of implementing it. </p> - <h2><a name='internalapi'>Defining the internal API</a></h2> + <h2><a id='internalapi'>Defining the internal API</a></h2> <p> Each public API call is associated with a driver, such as a host @@ -146,7 +146,7 @@ provide a <code>NULL</code> stub for the new function. </p> - <h2><a name='implpublic'>Implementing the public API</a></h2> + <h2><a id='implpublic'>Implementing the public API</a></h2> <p> Implementing the public API is largely a formality in which we wire up @@ -179,7 +179,7 @@ <p><code>src/libvirt-$MODULE.c</code></p> - <h2><a name='remoteproto'>Implementing the remote protocol</a></h2> + <h2><a id='remoteproto'>Implementing the remote protocol</a></h2> <p> Implementing the remote protocol is essentially a @@ -187,7 +187,7 @@ understood by referring to the existing code. </p> - <h3><a name='wireproto'>Defining the wire protocol format</a></h3> + <h3><a id='wireproto'>Defining the wire protocol format</a></h3> <p> Defining the wire protocol involves making additions to: @@ -226,7 +226,7 @@ src/remote/remote_protocol.h </code></p> - <h3><a name='rpcclient'>Implement the RPC client</a></h3> + <h3><a id='rpcclient'>Implement the RPC client</a></h3> <p> Implementing the RPC client uses the rpcgen generated .h files. diff --git a/docs/dbus.html.in b/docs/dbus.html.in index 6ff71d2770..4dfe4ca427 100644 --- a/docs/dbus.html.in +++ b/docs/dbus.html.in @@ -6,14 +6,14 @@ <ul id="toc"></ul> - <h2><a name="description">Description</a></h2> + <h2><a id="description">Description</a></h2> <p> libvirt-dbus wraps libvirt API to provide a high-level object-oriented API better suited for dbus-based applications. </p> - <h2><a name="git">GIT source repository</a></h2> + <h2><a id="git">GIT source repository</a></h2> <p> The D-Bus bindings source code is maintained in a <a href="https://git-scm.com/">git</a> repository available on @@ -32,7 +32,7 @@ git clone https://libvirt.org/git/libvirt-dbus.git <a href="https://libvirt.org/git/?p=libvirt-dbus.git">https://libvirt.org/git/?p=libvirt-dbus.git</a> </pre> - <h2><a name="usage">Usage</a></h2> + <h2><a id="usage">Usage</a></h2> <p> libvirt-dbus exports libvirt API using D-Bus objects with methods and diff --git a/docs/devhelp/html.xsl b/docs/devhelp/html.xsl index 9cdc049150..587cbfc1a9 100644 --- a/docs/devhelp/html.xsl +++ b/docs/devhelp/html.xsl @@ -173,7 +173,7 @@ <xsl:template mode="details" match="struct"> <xsl:variable name="name" select="string(@name)"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}">Structure </a><xsl:value-of select="$name"/></h3> + <h3><a id="{$name}">Structure </a><xsl:value-of select="$name"/></h3> <pre class="programlisting"> <xsl:value-of select="@type"/><xsl:text> { </xsl:text> @@ -214,7 +214,7 @@ <xsl:template mode="details" match="typedef[@type != 'enum']"> <xsl:variable name="name" select="string(@name)"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}">Typedef </a><xsl:value-of select="$name"/></h3> + <h3><a id="{$name}">Typedef </a><xsl:value-of select="$name"/></h3> <pre class="programlisting"> <xsl:call-template name="dumptext"> <xsl:with-param name="text" select="string(@type)"/> @@ -236,7 +236,7 @@ <xsl:template mode="details" match="variable"> <xsl:variable name="name" select="string(@name)"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}">Variable </a><xsl:value-of select="$name"/></h3> + <h3><a id="{$name}">Variable </a><xsl:value-of select="$name"/></h3> <pre class="programlisting"> <xsl:call-template name="dumptext"> <xsl:with-param name="text" select="string(@type)"/> @@ -258,7 +258,7 @@ <xsl:template mode="details" match="typedef[@type = 'enum']"> <xsl:variable name="name" select="string(@name)"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}">Enum </a><xsl:value-of select="$name"/></h3> + <h3><a id="{$name}">Enum </a><xsl:value-of select="$name"/></h3> <pre class="programlisting"> <xsl:text>enum </xsl:text> <a href="#{$name}"><xsl:value-of select="$name"/></a> @@ -267,7 +267,7 @@ <xsl:for-each select="/api/symbols/enum[@type=$name]"> <xsl:sort select="@value" data-type="number" order="ascending"/> <xsl:text> </xsl:text> - <a name="{@name}"><xsl:value-of select="@name"/></a> + <a id="{@name}"><xsl:value-of select="@name"/></a> <xsl:if test="@value"> <xsl:text> = </xsl:text> <xsl:value-of select="@value"/> @@ -295,7 +295,7 @@ <xsl:template mode="details" match="macro"> <xsl:variable name="name" select="string(@name)"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}">Macro </a><xsl:value-of select="$name"/></h3> + <h3><a id="{$name}">Macro </a><xsl:value-of select="$name"/></h3> <pre class="programlisting"> <xsl:text>#define </xsl:text> <a href="#{$name}"><xsl:value-of select="$name"/></a> @@ -342,7 +342,7 @@ <xsl:variable name="tlen" select="string-length(return/@type)"/> <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}"></a><xsl:value-of select="$name"/> ()</h3> + <h3><a id="{$name}"></a><xsl:value-of select="$name"/> ()</h3> <pre class="programlisting"> <xsl:call-template name="dumptext"> <xsl:with-param name="text" select="return/@type"/> @@ -419,7 +419,7 @@ <xsl:variable name="tlen" select="string-length(return/@type)"/> <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> <div class="refsect2" lang="en"> - <h3><a name="{$name}"></a>Function type <xsl:value-of select="$name"/> </h3> + <h3><a id="{$name}"></a>Function type <xsl:value-of select="$name"/> </h3> <pre class="programlisting"> <xsl:call-template name="dumptext"> <xsl:with-param name="text" select="return/@type"/> diff --git a/docs/genaclperms.pl b/docs/genaclperms.pl index 34c526021c..e20b4c11c3 100755 --- a/docs/genaclperms.pl +++ b/docs/genaclperms.pl @@ -84,7 +84,7 @@ foreach my $object (sort { $a cmp $b } keys %perms) { my $class = $class{$object}; my $olink = lc "object_" . $object; print <<EOF; -<h3><a name="$olink">$class</a></h3> +<h3><a id="$olink">$class</a></h3> <table class="acl"> <thead> <tr> @@ -106,7 +106,7 @@ EOF print <<EOF; <tr> - <td><a name="$plink">$perm</a></td> + <td><a id="$plink">$perm</a></td> <td>$description</td> </tr> EOF diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 4f4d86fbf1..494b8a27ec 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -364,7 +364,7 @@ when it was removed is also mentioned (highlighted in EOF foreach my $grp (sort { $a cmp $b } keys %groups) { - print "<h2><a name=\"$grp\">", $groupheaders{$grp}, "</a></h2>\n"; + print "<h2><a id=\"$grp\">", $groupheaders{$grp}, "</a></h2>\n"; print <<EOF; <table class="top_table"> <thead> diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 4c7b241659..ca8c703d5c 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -258,7 +258,7 @@ </xsl:call-template> </span> <xsl:text> </xsl:text> - <a name="{@name}"></a> + <a id="{@name}"></a> <xsl:value-of select="@name"/> <xsl:text> </xsl:text> @@ -281,7 +281,7 @@ </xsl:call-template> </span> <xsl:text> </xsl:text> - <a name="{$name}"><xsl:value-of select="$name"/></a> + <a id="{$name}"><xsl:value-of select="$name"/></a> <xsl:text> </xsl:text> </xsl:otherwise> @@ -320,7 +320,7 @@ <xsl:for-each select="/api/symbols/enum[@type = $name]"> <xsl:sort select="@value" data-type="number" order="ascending"/> <tr> - <td><a name="{@name}"><xsl:value-of select="@name"/></a></td> + <td><a id="{@name}"><xsl:value-of select="@name"/></a></td> <td><xsl:text> = </xsl:text></td> <xsl:choose> <xsl:when test="@info != ''"> -- 2.21.0

2 4

[libvirt] [PATCH 0/6] support boot from vfio-ccw mdev devices
by Bjoern Walk 28 Aug '19

28 Aug '19

v2 -> v3: * use real QEMU capabilities data for tests Boris Fiuczynski (6): tests: add vfio-ap mdev tests tests: add vhost scsi hostdev boot unsupported test qemu: move hostdev boot validation into domain validation qemu: make error messages device specific qemu: refactor mdev validation method signatures qemu: support bootindex on vfio-ccw mdev devices src/qemu/qemu_command.c | 16 ++---- src/qemu/qemu_domain.c | 53 ++++++++++++++----- .../hostdev-scsi-vhost-scsi-pci-boot-fail.xml | 41 ++++++++++++++ .../hostdev-subsys-mdev-vfio-ap-boot-fail.xml | 23 ++++++++ .../hostdev-subsys-mdev-vfio-ap.args | 28 ++++++++++ ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 33 ++++++++++++ .../hostdev-subsys-mdev-vfio-ap.xml | 22 ++++++++ ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 34 ++++++++++++ .../hostdev-subsys-mdev-vfio-ccw-boot.xml | 23 ++++++++ tests/qemuxml2argvtest.c | 8 +++ .../hostdev-subsys-mdev-vfio-ap.xml | 27 ++++++++++ ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 29 ++++++++++ tests/qemuxml2xmltest.c | 6 +++ 13 files changed, 319 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap-boot-fail.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml -- 2.21.0

2 9

[libvirt] [PATCH v2 2/4] audio: omitting audiodev= parameter is only deprecated
by Kővágó, Zoltán 28 Aug '19

28 Aug '19

Unfortunately, changes introduced in af2041ed2d "audio: audiodev= parameters no longer optional when -audiodev present" breaks backward compatibility. This patch changes the error into a deprecation warning. Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu(a)gmail.com> --- qemu-deprecated.texi | 7 +++++++ audio/audio.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 00a4b6f350..9d74a1cfc0 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -72,6 +72,13 @@ backend settings instead of environment variables. To ease migration to the new format, the ``-audiodev-help'' option can be used to convert the current values of the environment variables to ``-audiodev'' options. +@subsection Creating sound card devices and vnc without audiodev= property (since 4.2) + +When not using the deprecated legacy audio config, each sound card +should specify an @code{audiodev=} property. Additionally, when using +vnc, you should specify an @code{audiodev=} propery if you plan to +transmit audio through the VNC protocol. + @subsection -mon ...,control=readline,pretty=on|off (since 4.1) The @code{pretty=on|off} switch has no effect for HMP monitors, but is diff --git a/audio/audio.c b/audio/audio.c index ae335dbebb..e99fcd0694 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1412,8 +1412,9 @@ static AudioState *audio_init(Audiodev *dev, const char *name) drvname = AudiodevDriver_str(dev->driver); } else if (!QTAILQ_EMPTY(&audio_states)) { if (!legacy_config) { - dolog("You must specify an audiodev= for the device %s\n", name); - exit(1); + dolog("Device %s: audiodev default parameter is deprecated, please " + "specify audiodev=%s\n", name, + QTAILQ_FIRST(&audio_states)->dev->id); } return QTAILQ_FIRST(&audio_states); } else { @@ -1548,8 +1549,7 @@ CaptureVoiceOut *AUD_add_capture( if (!s) { if (!legacy_config) { - dolog("You must specify audiodev when trying to capture\n"); - return NULL; + dolog("Capturing without setting an audiodev is deprecated\n"); } s = audio_init(NULL, NULL); } -- 2.22.0

2 1

Re: [libvirt] [BUG] When PLUG a bridge interface to an active VM, the generated LIVE and CONFIG mac address are different
by wujing (O) 28 Aug '19

28 Aug '19

> >>> On 8/22/19 10:43 AM, Xu Yandong (Yandong Xu) wrote: > >> That possibly might be out of scope, but autofilling the mac address > >> as early as virDomainNetDefParseXML also is not ideal. > > > > We have pushed a patch bellow that can restore the situation to an older > state. > > > > Subject: [PATCH] qemu: use the same def when attaching device live and > > config > > > > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index > > 617d7d5..eca54d0 100644 > > --- a/src/qemu/qemu_driver.c > > +++ b/src/qemu/qemu_driver.c > > @@ -8615,6 +8615,22 @@ > qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, > > if (!(caps = virQEMUDriverGetCapabilities(driver, false))) > > goto cleanup; > > > > + if (flags & VIR_DOMAIN_AFFECT_CONFIG && > > + flags & VIR_DOMAIN_AFFECT_LIVE) { > > + /* If we are affecting both CONFIG and LIVE > > + * use the same xml of device preferentially > > + * to make the configuration consistent. > > + */ > > + devLive = virDomainDeviceDefParse(xml, vm->def, > > This use of vm->def prefers live XML. This means that for instance PCI > address are assigned based on current PCI layout in live XML which in general > is different to inactive XML. > > And it's not only PCI addresses, we autogenerate some out aspects of > <interface/> (e.g. model) and even more for other devices. Just take a look > at qemuDomainDeviceDefPostParse(). All functions there which take domain > def as an argument do so because they are basing autogenerated value on > domain definition. Plus there's more in parser code. > > While your patch might work for your use case, it can break others. > > BTW: have you read the original commit that caused this? I'm failing to see > how we would not re-introduce the problem with your patch. If you're using > live XML to validate/generate device addresses, how can we generate valid > address for inactive XML? > This patch is a little different with the original commit, since we only prefer live XML when using LIVE AND CONFIG flags at the same time. Still parse separate device def if attach with only one flag. So this patch is kinda a combination of 1e0534a7702 and 55ce6564634, just to narrow down the problem influence. And I verified as the steps in https://bugzilla.redhat.com/show_bug.cgi?id=1559867, work as expected. Wu Jing

2 1