March 2023 - Devel - libvirt List Archives

[PATCH] qemuAppendLoadparmMachineParm: add loadparm from hostdev
by Eric Farman 10 Mar '23

10 Mar '23

Commit 54fa1b44afc ("conf: Add loadparm boot option for a boot device") added the ability to specify a loadparm parameter on a <boot/> tag, while commit 29ba41c2d40 ("qemu: Add loadparm to qemu command line string") added that value to the QEMU "-machine" command line parameters. Unfortunately, the latter commit only looked at disks and network devices for boot information, even though anything with VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT could potentially have this tag. In practice, a <hostdev> tag pointing to a passthrough (SCSI or DASD) disk device can be used in this way, which means the loadparm is accepted, but not given to QEMU. Correct this, and add some XML/argv tests. Signed-off-by: Eric Farman <farman(a)linux.ibm.com> --- src/qemu/qemu_command.c | 24 ++++++++++++++ ...machine-loadparm-hostdev.s390x-latest.args | 33 +++++++++++++++++++ .../machine-loadparm-hostdev.xml | 23 +++++++++++++ tests/qemuxml2argvtest.c | 1 + .../machine-loadparm-hostdev.s390x-latest.xml | 33 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 115 insertions(+) create mode 100644 tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/machine-loadparm-hostdev.xml create mode 100644 tests/qemuxml2xmloutdata/machine-loadparm-hostdev.s390x-latest.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0f0f72fbea..929bcc0be1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6595,6 +6595,30 @@ qemuAppendLoadparmMachineParm(virBuffer *buf, return; } } + + for (i = 0; i< def->nhostdevs; i++) { + virDomainHostdevDef *hostdev = def->hostdevs[i]; + virDomainHostdevSubsys *subsys = &hostdev->source.subsys; + virDomainHostdevSubsysMediatedDev *mdevsrc = &subsys->u.mdev; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + + /* Only get the load parameter from a bootable disk */ + if (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && + subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) + continue; + + /* For MDEV hostdevs, only CCW types are bootable */ + if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && + mdevsrc->model != VIR_MDEV_MODEL_TYPE_VFIO_CCW) + continue; + + if (hostdev->info->bootIndex == 1 && hostdev->info->loadparm) { + virBufferAsprintf(buf, ",loadparm=%s", hostdev->info->loadparm); + return; + } + } } diff --git a/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args b/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args new file mode 100644 index 0000000000..0b59d67ea1 --- /dev/null +++ b/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,loadparm=2 \ +-accel tcg \ +-cpu qemu \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912}' \ +-overcommit mem-lock=off \ +-smp 2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device vfio-ccw,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/90c6c135-ad44-41d0-b1b7-bae47de48627,bootindex=1,devno=fe.0.0000 \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-loadparm-hostdev.xml b/tests/qemuxml2argvdata/machine-loadparm-hostdev.xml new file mode 100644 index 0000000000..70ce9789cb --- /dev/null +++ b/tests/qemuxml2argvdata/machine-loadparm-hostdev.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + </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-s390x</emulator> + <hostdev mode='subsystem' type='mdev' model='vfio-ccw'> + <source> + <address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/> + </source> + <boot order='1' loadparm='2'/> + </hostdev> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 60fc69a92c..c879fa90e0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2629,6 +2629,7 @@ mymain(void) DO_TEST_NOCAPS("machine-loadparm-s390"); DO_TEST_NOCAPS("machine-loadparm-net-s390"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-char-invalid"); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-len-invalid"); diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-hostdev.s390x-latest.xml b/tests/qemuxml2xmloutdata/machine-loadparm-hostdev.s390x-latest.xml new file mode 100644 index 0000000000..f564d6deb0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/machine-loadparm-hostdev.s390x-latest.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> + <source> + <address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/> + </source> + <boot order='1' loadparm='2'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </hostdev> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> + </memballoon> + <panic model='s390'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 441bfcbb97..a1be43ab34 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -227,6 +227,7 @@ mymain(void) DO_TEST_NOCAPS("machine-core-off"); DO_TEST_CAPS_LATEST("machine-smm-on"); DO_TEST_CAPS_LATEST("machine-smm-off"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); DO_TEST_NOCAPS("default-kvm-host-arch"); DO_TEST_NOCAPS("default-qemu-host-arch"); -- 2.37.2

2 1

[PATCH] qemu: tpm: Pass --logfile to swtpm_setup for incoming migration
by Eiichi Tsukata 10 Mar '23

10 Mar '23

Good to have for debugging in case something wrong happens during incoming migration. Signed-off-by: Eiichi Tsukata <eiichi.tsukata(a)nutanix.com> --- src/qemu/qemu_tpm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 982e5f13b6..f4344de663 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -427,6 +427,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, } else { virCommandAddArgList(cmd, "--tpm-state", storagepath, + "--logfile", logfile, "--overwrite", NULL); } -- 2.39.2

2 1

[libvirt PATCH 0/3] external snapshot delete fixes
by Pavel Hrdina 09 Mar '23

09 Mar '23

Pavel Hrdina (3): qemu_snapshot: properly ignore disks with manual snapshot qemu_snapshot: fix external snapshot deletion for non-active snapshots domainsnapshot: add snapshotDeleteInProgress to RNG schema src/conf/schemas/domainsnapshot.rng | 10 ++++++++++ src/qemu/qemu_snapshot.c | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) -- 2.39.2

2 4

[libvirt PATCH] apparmor: Enable passt support
by Andrea Bolognani 08 Mar '23

08 Mar '23

passt provides an AppArmor abstraction that covers all the inner details of its operation, so we can simply import that and add the libvirt-specific parts on top: namely, passt needs to be able to create a socket and pid file, while the libvirt daemon needs to be able to kill passt. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- src/security/apparmor/libvirt-qemu | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index 9af1333b22..44056b5f14 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -185,6 +185,21 @@ /usr/{lib,lib64}/libswtpm_libtpms.so mr, /usr/lib/(a){multiarch}/libswtpm_libtpms.so mr, + # support for passt network back-end + /usr/bin/passt Cx -> passt, + + profile passt { + /usr/bin/passt r, + + signal (receive) set=("term") peer=/usr/sbin/libvirtd, + signal (receive) set=("term") peer=libvirtd, + signal (receive) set=("term") peer=virtqemud, + + owner /{,var/}run/libvirt/qemu/passt/* rw, + + include if exists <abstractions/passt> + } + # for save and resume /{usr/,}bin/dash rmix, /{usr/,}bin/dd rmix, -- 2.39.2

2 4

[PATCH] rpc: genprotocol: Always apply fixups to rpcgen's output
by Peter Krempa 08 Mar '23

08 Mar '23

The platform check which determines when to apply the fixups mentions all officially supported build targets (per docs/platforms.rst) thus it's not really necessary. Additionally while not explicitly written as supported the check does not work properly when building with the MinGW toolchain on Windows as it does not apply the needed transformations. They are necessary there the same way as with MinGW on Linux. https://gitlab.com/libvirt/libvirt/-/issues/453 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/rpc/genprotocol.pl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index f567260588..adf3991d7a 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Generate code for an XDR protocol, optionally applying +# Generate code for an XDR protocol, applying # fixups to the glibc rpcgen code so that it compiles # with warnings turned on. # @@ -47,20 +47,11 @@ open RPCGEN, "-|", "$rpcgen $mode $xdrdef" open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "gnukfreebsd" || $^O eq "freebsd" || $^O eq "darwin"; - if ($mode eq "-c") { print TARGET "#include <config.h>\n"; } while (<RPCGEN>) { - # We only want to fixup the GLibc rpcgen output - # So just print data unchanged, if non-Linux - unless ($fixup) { - print TARGET; - next; - } - if (m/^{/) { $in_function = 1; print TARGET; -- 2.39.2

2 1

[PATCH 0/4] virscsihost: Couple of cleanups and fixes
by Michal Privoznik 08 Mar '23

08 Mar '23

*** BLURB HERE *** Michal Prívozník (4): virscsihost: use g_autofree more virSCSIHostFindByPCI: Decrease scope of some variables virscsihost: Drop needless labels virSCSIHostFindByPCI: Fix link detection src/util/virscsihost.c | 48 ++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) -- 2.39.2

2 6

[libvirt PATCH v2] remote: add mutex when freeing private callbacks
by Mike Pontillo 07 Mar '23

07 Mar '23

This commit resolves illegal memory accesses observed via: remoteClientFreePrivateCallbacks() remoteClientCloseFunc() virNetServerClientCloseLocked() virNetServerProcessClients() daemonServerProcessClients() virHashForEach() virNetDaemonRun() main() Signed-off-by: Mike Pontillo <mpontillo(a)digitalocean.com> --- src/remote/remote_daemon_dispatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 250eb51e6b..0d843d63f6 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1709,6 +1709,8 @@ static void remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv) { g_autoptr(virIdentity) sysident = virIdentityGetSystem(); + VIR_LOCK_GUARD lock = virLockGuardLock(&priv->lock); + virIdentitySetCurrent(sysident); DEREG_CB(priv->conn, priv->domainEventCallbacks, -- 2.34.1

2 1

[libvirt PATCH 0/6] do not report errors in virPidFileForceCleanupPathFull
by Ján Tomko 07 Mar '23

07 Mar '23

https://bugzilla.redhat.com/show_bug.cgi?id=2171973 Ján Tomko (6): util: remove waitForLock from virPidFileAcquire util: introduce virPidFileAcquirePathFull leaseshelper: use virPidFileAcquirePathFull util: virPidFileAcquirePath: remove waitForLock argument util: add quiet parameter to virPidFileAcquirePathFull util: do not report errors in virPidFileForceCleanupPathFull src/bhyve/bhyve_driver.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 2 +- src/locking/lock_daemon.c | 4 +- src/logging/log_daemon.c | 4 +- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 3 +- src/network/leaseshelper.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_daemon.c | 2 +- src/secret/secret_driver.c | 2 +- src/storage/storage_driver.c | 3 +- src/util/vircommand.c | 2 +- src/util/virpidfile.c | 69 +++++++++++++++---------- src/util/virpidfile.h | 6 ++- src/vz/vz_driver.c | 2 +- 20 files changed, 67 insertions(+), 49 deletions(-) -- 2.39.2

2 7

[libvirt PATCH] remote: add mutex when freeing private callbacks
by Mike Pontillo 07 Mar '23

07 Mar '23

This commit resolves illegal memory accesses observed via: remoteClientFreePrivateCallbacks() remoteClientCloseFunc() virNetServerClientCloseLocked() virNetServerProcessClients() daemonServerProcessClients() virHashForEach() virNetDaemonRun() main() Signed-off-by: Mike Pontillo <mpontillo(a)digitalocean.com> --- src/remote/remote_daemon_dispatch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 250eb51e6b..8d043d0bce 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1711,6 +1711,8 @@ remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv) g_autoptr(virIdentity) sysident = virIdentityGetSystem(); virIdentitySetCurrent(sysident); + virMutexLock(&priv->lock); + DEREG_CB(priv->conn, priv->domainEventCallbacks, priv->ndomainEventCallbacks, virConnectDomainEventDeregisterAny, "domain"); @@ -1737,6 +1739,8 @@ remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv) } virIdentitySetCurrent(NULL); + + virMutexUnlock(&priv->lock); } #undef DEREG_CB -- 2.34.1

2 3

[PATCH v2 0/8] migration/migrationpin:support migration pin
by Jiang Jiacheng 07 Mar '23

07 Mar '23

Support set the CPU affinity of the live migration threads to improve the migration performance in specific cases. By default, the migration thread shares CPU resources with the VM process. With those API, support pin migration thread to expected CPU list to avoid preempting CPU resources of VM process. Use the following methods to implement migration thread pin: - set the cpulist by virsh command 'virsh migrationpin' or migration param 'migration.pin'. These settings affect only the next migration - continuously query migration thread information[1] during the migration process until matches the thread number desired or migration finished unexpectedly - pin migration thread to expected cpulist, we can set/change the cpulist by 'virsh migrationpin' during migration at anytime Note that only support pin main thread of migration(live migration) and parallel send threads now. diff to v1: - add qmp command to query migration thread information - change the method of get qemu's migration thread info, from qemu event to qmp commands. - unified the interface of common migration and parallel migration. ref: [1]https://patchew.org/QEMU/20230203073519.2969147-1-jiangjiacheng@huawei.co… Jiang Jiacheng (8): migration/migration-pin: Implemente the interface of obtaining migration thread information migration/migration-pin: get migration pid for migration pin migration/migration-pin: Introduce virDomainPinMigrationThread API migration/migration-pin: Implement qemuDomainPinMigrationThread migration/migration-pin: support migration pin by virsh command migration/migration-pin: add migrationpin for migration parameters migration/migration-pin: pin migration thread immediately after get thread info migration/migration-pin/multifd-pin: add migration pin status handle include/libvirt/libvirt-domain.h | 15 +++ src/conf/domain_conf.c | 9 ++ src/conf/domain_conf.h | 10 ++ src/conf/virconftypes.h | 2 + src/driver-hypervisor.h | 6 + src/libvirt-domain.c | 65 ++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 26 ++++ src/qemu/qemu_domain.h | 13 ++ src/qemu/qemu_driver.c | 56 +++++++++ src/qemu/qemu_migration.c | 111 +++++++++++++++++ src/qemu/qemu_migration.h | 33 +++--- src/qemu/qemu_migration_params.c | 40 +++++++ src/qemu/qemu_migration_params.h | 9 ++ src/qemu/qemu_monitor.c | 25 ++++ src/qemu/qemu_monitor.h | 11 ++ src/qemu/qemu_monitor_json.c | 62 ++++++++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 198 +++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 13 ++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + src/util/vircgroup.c | 3 + src/util/vircgroup.h | 1 + tools/virsh-domain.c | 69 +++++++++++ 27 files changed, 789 insertions(+), 17 deletions(-) -- 2.33.0

1 8