- Devel - libvirt List Archives

[PATCH] libxl: Release auto-allocated spice ports
by Jim Fehlig 08 Feb '22

08 Feb '22

While VNC ports auto-allocated by the libxl driver are released in libxlDomainCleanup, spice ports are overlooked. Rework the existing logic to release any auto-allocated graphics ports, not just the VNC port of the first graphics device. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 577985b5ea..b995f20a64 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -906,10 +906,10 @@ libxlDomainCleanup(libxlDriverPrivate *driver, { libxlDomainObjPrivate *priv = vm->privateData; g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); - int vnc_port; char *file; virHostdevManager *hostdev_mgr = driver->hostdevMgr; unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; + size_t i; VIR_DEBUG("Cleaning up domain with id '%d' and name '%s'", vm->def->id, vm->def->name); @@ -944,13 +944,31 @@ libxlDomainCleanup(libxlDriverPrivate *driver, if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); - if ((vm->def->ngraphics == 1) && - vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - vm->def->graphics[0]->data.vnc.autoport) { - vnc_port = vm->def->graphics[0]->data.vnc.port; - if (vnc_port >= LIBXL_VNC_PORT_MIN) { - if (virPortAllocatorRelease(vnc_port) < 0) - VIR_DEBUG("Could not mark port %d as unused", vnc_port); + /* Release auto-allocated graphics ports */ + for (i = 0; i < vm->def->ngraphics; i++) { + virDomainGraphicsDef *graphics = vm->def->graphics[i]; + int gport = -1; + + switch (graphics->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + if (graphics->data.vnc.autoport && + graphics->data.vnc.port >= LIBXL_VNC_PORT_MIN) + gport = graphics->data.vnc.port; + break; + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (graphics->data.spice.autoport) + gport = graphics->data.spice.port; + break; + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + case VIR_DOMAIN_GRAPHICS_TYPE_RDP: + case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + break; + } + if (gport != -1) { + if (virPortAllocatorRelease(gport) < 0) + VIR_DEBUG("Could not mark port %d as unused", gport); } } -- 2.34.1

2 1

[libvirt][PATCH v10 0/5] Support query and use SGX
by Haibin Huang 08 Feb '22

08 Feb '22

This patch series provides support for enabling Intel's Software Guard Extensions (SGX) feature in guest VM. Giving the SGX support in QEMU had been merged. Intel SGX is a set of instructions that increases the security of application code and data, giving them more protection from disclosure or modification. Developers can partition sensitive information into enclaves, which are areas of execution in memory with more security protection. It depends on QEMU fixing[1], which will move cpu QOM object from /machine/unattached/device[nn] to /machine/cpu[nn]. It requires libvirt to change the default cpu QOM object location once QEMU patch gets accepted, but it is out of this SGX patch scope. The typical flow looks below at very high level: 1. Calls virConnectGetDomainCapabilities API to domain capabilities that includes the following SGX information. <feature> ... <sgx supported='yes'> <epc_size unit='KiB'>N</epc_size> </sgx> ... </feature> 2. User requests to start a guest calling virCreateXML() with SGX requirement. It does not support NUMA yet, since latest QEMU 6.2 release does not support NUMA. It should contain <devices> ... <memory model='sgx-epc'> <target> <size unit='KiB'>N</size> </target> </memory> ... </devices> [1] https://lists.nongnu.org/archive/html/qemu-devel/2022-01/msg03534.html Haibin Huang (3): qemu: provide support to query the SGX capability conf: expose SGX feature in domain capabilities Add unit test for domaincapsdata sgx Lin Yang (2): conf: Introduce SGX EPC element into device memory xml Update default CPU location in qemu QOM tree docs/formatdomain.rst | 9 +- docs/formatdomaincaps.html.in | 26 ++++ docs/schemas/domaincaps.rng | 22 ++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_capabilities.c | 29 ++++ src/conf/domain_capabilities.h | 13 ++ src/conf/domain_conf.c | 6 + src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 16 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 3 + src/qemu/qemu_capabilities.c | 137 ++++++++++++++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 4 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 38 +++-- src/qemu/qemu_domain_address.c | 6 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor.c | 10 ++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 84 ++++++++++- src/qemu/qemu_monitor_json.h | 9 ++ src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 8 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 4 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 4 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 4 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 4 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 4 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 4 + .../caps_6.2.0.x86_64.replies | 22 ++- .../caps_6.2.0.x86_64.xml | 5 + .../caps_7.0.0.x86_64.replies | 22 ++- .../caps_7.0.0.x86_64.xml | 5 + tests/qemuxml2argvdata/sgx-epc.xml | 36 +++++ .../sgx-epc.x86_64-latest.xml | 52 +++++++ tests/qemuxml2xmltest.c | 2 + 138 files changed, 675 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-latest.xml -- 2.17.1

3 7

[PATCH] libxl: Set auto-allocated graphics ports to used on reconnect
by Jim Fehlig 07 Feb '22

07 Feb '22

The libxl driver reconnects to all running VMs when libvirtd is restarted, but it failed to mark auto-allocated graphics ports as set in the port allocator. If many VMs are running that use port auto-allocation and libvirtd is restarted, the port allocator is likely to hand out a port already in use when a new VM is created that uses auto-allocation. VM creation will fail due to the port clash. When reconnecting to running VMs after a libvirtd restart, let the port allocator know about previously allocated ports. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Like 31e937fb3b, another item unaccounted for when reconnecting to VMs after a daemon restart. src/libxl/libxl_driver.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 2d9385654c..97965aaf1d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -393,6 +393,7 @@ libxlReconnectDomain(virDomainObj *vm, virHostdevManager *hostdev_mgr = driver->hostdevMgr; unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; int ret = -1; + size_t i; hostdev_flags |= VIR_HOSTDEV_SP_USB; @@ -447,6 +448,28 @@ libxlReconnectDomain(virDomainObj *vm, libxlReconnectNotifyNets(vm->def); + /* Set any auto-allocated graphics ports to used */ + for (i = 0; i < vm->def->ngraphics; i++) { + virDomainGraphicsDef *graphics = vm->def->graphics[i]; + + switch (graphics->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + if (graphics->data.vnc.autoport) + virPortAllocatorSetUsed(graphics->data.vnc.port); + break; + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (graphics->data.spice.autoport) + virPortAllocatorSetUsed(graphics->data.spice.port); + break; + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + case VIR_DOMAIN_GRAPHICS_TYPE_RDP: + case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + break; + } + } + if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Cannot update XML for running Xen guest %s", vm->def->name); -- 2.34.1

2 2

[PATCH 0/2] lib: Use g_clear_pointer() more
by Michal Privoznik 07 Feb '22

07 Feb '22

2 3

[PATCH 0/7] qemu: Don't use hardcoded QOM path for vcpu
by Peter Krempa 07 Feb '22

07 Feb '22

Peter Krempa (7): qemuMonitorJSONGetCPUx86Data: Unexport qemuProcessUpdateAndVerifyCPU: Refactor cleanup qemu: monitor: Don't hardcode QOM path of first CPU qemu: domain: Store 'qomPath' in qemuDomainVcpuPrivate qemu: process: Move cpu flag querying after code probing cpus qemu: process: Move call to qemuProcessRefreshCPU after cpu probe qemu: process: Don't use hardcoded QOM path for cpu for probing flags src/qemu/qemu_domain.c | 3 ++ src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_monitor.c | 17 +++++++---- src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 40 +++++++++++++++----------- src/qemu/qemu_monitor_json.h | 8 ++---- src/qemu/qemu_process.c | 55 ++++++++++++++++++++++-------------- tests/qemumonitorjsontest.c | 2 ++ 8 files changed, 82 insertions(+), 48 deletions(-) -- 2.34.1

2 10

[PATCH] qemu: fix formatting of pflash readonly attribute
by Daniel P. Berrangé 07 Feb '22

07 Feb '22

When the <loader> had an explicit readonly='no' attribute we accidentally still marked the plfash as readonly due to the bad conversion from virTristateBool to bool. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_domain.c | 3 +- .../bios-nvram-implicit-rw.x86_64-latest.args | 39 +++++++++++++++++++ .../bios-nvram-implicit-rw.xml | 35 +++++++++++++++++ .../bios-nvram-rw.x86_64-latest.args | 39 +++++++++++++++++++ tests/qemuxml2argvdata/bios-nvram-rw.xml | 35 +++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 6 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-implicit-rw.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-implicit-rw.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9f9e969872..ec71144808 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11120,7 +11120,8 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm) pflash0->type = VIR_STORAGE_TYPE_FILE; pflash0->format = VIR_STORAGE_FILE_RAW; pflash0->path = g_strdup(def->os.loader->path); - pflash0->readonly = def->os.loader->readonly; + pflash0->readonly = false; + virTristateBoolToBool(def->os.loader->readonly, &pflash0->readonly); pflash0->nodeformat = g_strdup("libvirt-pflash0-format"); pflash0->nodestorage = g_strdup("libvirt-pflash0-storage"); diff --git a/tests/qemuxml2argvdata/bios-nvram-implicit-rw.x86_64-latest.args b/tests/qemuxml2argvdata/bios-nvram-implicit-rw.x86_64-latest.args new file mode 100644 index 0000000000..fde4c3f57f --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-implicit-rw.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test-bios \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test-bios,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \ +-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-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 menu=on,strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/bios-nvram-implicit-rw.xml b/tests/qemuxml2argvdata/bios-nvram-implicit-rw.xml new file mode 100644 index 0000000000..ebcd3e5300 --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-implicit-rw.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>test-bios</name> + <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <loader type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args b/tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args new file mode 100644 index 0000000000..fde4c3f57f --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test-bios \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test-bios,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \ +-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-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 menu=on,strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/bios-nvram-rw.xml b/tests/qemuxml2argvdata/bios-nvram-rw.xml new file mode 100644 index 0000000000..b03b4b5ecb --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-rw.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>test-bios</name> + <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <loader readonly='no' type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b9d8885912..b1592f3214 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1273,6 +1273,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("bios-nvram-rw"); + DO_TEST_CAPS_LATEST("bios-nvram-implicit-rw"); /* Make sure all combinations of ACPI and UEFI behave as expected */ DO_TEST_NOCAPS("q35-acpi-uefi"); -- 2.34.1

2 1

[PATCH 0/3] Mdev test cleanup, completion and parent addr exposure
by Boris Fiuczynski 07 Feb '22

07 Feb '22

Clean up the testing json. Add a test for vfio-ccw mdev. Expose the parent address in the XML when dumping a mdev nodedev as the address is now part of the mdev nodedev name and users should not parse and manipulate the mdev nodedev name to retrieve it. Boris Fiuczynski (3): tests: correct formating in mdevctl test tests: adding vfio-ccw to nodedev tests nodedev: add parent_addr to mdev nodedev dumpxml docs/schemas/nodedev.rng | 5 ++ src/conf/node_device_conf.c | 2 + ...52_9b13_9b13_9b13_cc23009b1326-create.argv | 5 ++ ...52_9b13_9b13_9b13_cc23009b1326-create.json | 1 + ...52_9b13_9b13_9b13_cc23009b1326-define.argv | 5 ++ ...52_9b13_9b13_9b13_cc23009b1326-define.json | 1 + .../mdevctl-list-multiple.json | 56 +++++++++++-------- .../mdevctl-list-multiple.out.xml | 14 +++++ tests/nodedevmdevctltest.c | 31 +++++++++- ...v_cc000052_9b13_9b13_9b13_cc23009b1326.xml | 8 +++ 10 files changed, 104 insertions(+), 24 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_cc000052_9b13_9b13_9b13_cc23009b1326-create.argv create mode 100644 tests/nodedevmdevctldata/mdev_cc000052_9b13_9b13_9b13_cc23009b1326-create.json create mode 100644 tests/nodedevmdevctldata/mdev_cc000052_9b13_9b13_9b13_cc23009b1326-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_cc000052_9b13_9b13_9b13_cc23009b1326-define.json create mode 100644 tests/nodedevschemadata/mdev_cc000052_9b13_9b13_9b13_cc23009b1326.xml -- 2.33.1

3 6

[libvirt PATCH 0/4] qemu: make nvram creation more robust and enable recovery
by Daniel P. Berrangé 07 Feb '22

07 Feb '22

Daniel P. Berrangé (4): qemu: do crash safe creation of NVRAM file include: define constants for resetting NVRAM state qemu: wire up support for resetting NVRAM tools: add --reset-nvram arg to several virsh commands docs/manpages/virsh.rst | 21 ++++++++++++--- include/libvirt/libvirt-domain-snapshot.h | 1 + include/libvirt/libvirt-domain.h | 2 ++ src/libvirt-domain.c | 16 ++++++++++++ src/qemu/qemu_driver.c | 24 ++++++++++++----- src/qemu/qemu_process.c | 32 ++++++++++++++++++----- src/qemu/qemu_process.h | 1 + src/qemu/qemu_saveimage.c | 9 +++++-- src/qemu/qemu_saveimage.h | 1 + src/qemu/qemu_snapshot.c | 6 ++++- tools/virsh-domain.c | 18 +++++++++++++ tools/virsh-snapshot.c | 6 +++++ 12 files changed, 117 insertions(+), 20 deletions(-) -- 2.34.1

2 5

[PATCH v4 2/4] hw/i386: Attach CPUs to machine
by Philippe Mathieu-Daudé 07 Feb '22

07 Feb '22

Previously CPUs were exposed in the QOM tree at a path /machine/unattached/device[nn] where the 'nn' of the first CPU is usually zero, but can vary depending on what devices were already created. With this change the CPUs are now at /machine/cpu[nn] where the 'nn' of the first CPU is always zero. Note: This (intentionally) breaks compatibility with current libvirt code that looks for "/machine/unattached/device[0]" in the assumption it is the first CPU. Cc: libvir-list(a)redhat.com Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- hw/i386/x86.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index b84840a1bb9..50bf249c700 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -108,6 +108,7 @@ void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) { Object *cpu = object_new(MACHINE(x86ms)->cpu_type); + object_property_add_child(OBJECT(x86ms), "cpu[*]", OBJECT(cpu)); if (!object_property_set_uint(cpu, "apic-id", apic_id, errp)) { goto out; } -- 2.34.1

6 12

[PULL 31/31] linux-user: Remove the deprecated ppc64abi32 target
by Alex Bennée 07 Feb '22

07 Feb '22

From: Thomas Huth <thuth(a)redhat.com> It's likely broken, and nobody cared for picking it up again during the deprecation phase, so let's remove this now. Since this is the last entry in deprecated_targets_list, remove the related code in the configure script, too. Signed-off-by: Thomas Huth <thuth(a)redhat.com> Reviewed-by: Richard Henderson <richard.henderson(a)linaro.org> Acked-by: Cédric Le Goater <clg(a)kaod.org> Acked-by: Alex Bennée <alex.bennee(a)linaro.org> Message-Id: <20211215084958.185214-1-thuth(a)redhat.com> Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> Message-Id: <20220105135009.1584676-35-alex.bennee(a)linaro.org> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e21e07478f..6f85afdee4 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -390,13 +390,6 @@ The above, converted to the current supported format:: linux-user mode CPUs -------------------- -``ppc64abi32`` CPUs (since 5.2) -''''''''''''''''''''''''''''''' - -The ``ppc64abi32`` architecture has a number of issues which regularly -trip up our CI testing and is suspected to be quite broken. For that -reason the maintainers strongly suspect no one actually uses it. - MIPS ``I7200`` CPU (since 5.2) '''''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 4c4da20d0f..380a1b30ea 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -601,6 +601,14 @@ the upstream Linux kernel in 2018, and it has also been dropped from glibc, so there is no new Linux development taking place with this architecture. For running the old binaries, you can use older versions of QEMU. +``ppc64abi32`` CPUs (removed in 7.0) +'''''''''''''''''''''''''''''''''''' + +The ``ppc64abi32`` architecture has a number of issues which regularly +tripped up the CI testing and was suspected to be quite broken. For that +reason the maintainers strongly suspected no one actually used it. + + System emulator devices ----------------------- diff --git a/docs/user/main.rst b/docs/user/main.rst index e08d4be63b..6f2ffa080f 100644 --- a/docs/user/main.rst +++ b/docs/user/main.rst @@ -166,7 +166,6 @@ Other binaries - user mode (PowerPC) - * ``qemu-ppc64abi32`` TODO. * ``qemu-ppc64`` TODO. * ``qemu-ppc`` TODO. diff --git a/configure b/configure index 030728d11e..0c57a063c6 100755 --- a/configure +++ b/configure @@ -1273,8 +1273,6 @@ if [ "$ARCH" = "unknown" ]; then fi default_target_list="" -deprecated_targets_list=ppc64abi32-linux-user -deprecated_features="" mak_wilds="" if [ "$softmmu" = "yes" ]; then @@ -1287,16 +1285,6 @@ if [ "$bsd_user" = "yes" ]; then mak_wilds="${mak_wilds} $source_path/configs/targets/*-bsd-user.mak" fi -# If the user doesn't explicitly specify a deprecated target we will -# skip it. -if test -z "$target_list"; then - if test -z "$target_list_exclude"; then - target_list_exclude="$deprecated_targets_list" - else - target_list_exclude="$target_list_exclude,$deprecated_targets_list" - fi -fi - for config in $mak_wilds; do target="$(basename "$config" .mak)" if echo "$target_list_exclude" | grep -vq "$target"; then @@ -1315,11 +1303,9 @@ Standard options: --prefix=PREFIX install in PREFIX [$prefix] --interp-prefix=PREFIX where to find shared libraries, etc. use %M for cpu name [$interp_prefix] - --target-list=LIST set target list (default: build all non-deprecated) + --target-list=LIST set target list (default: build all) $(echo Available targets: $default_target_list | \ fold -s -w 53 | sed -e 's/^/ /') -$(echo Deprecated targets: $deprecated_targets_list | \ - fold -s -w 53 | sed -e 's/^/ /') --target-list-exclude=LIST exclude a set of targets from the default target-list Advanced options (experts only): @@ -1804,13 +1790,6 @@ else done fi -for target in $target_list; do - # if a deprecated target is enabled we note it here - if echo "$deprecated_targets_list" | grep -q "$target"; then - add_to deprecated_features $target - fi -done - # see if system emulation was really requested case " $target_list " in *"-softmmu "*) softmmu=yes @@ -3950,12 +3929,6 @@ else fi fi -if test -n "${deprecated_features}"; then - echo "Warning, deprecated features enabled." - echo "Please see docs/about/deprecated.rst" - echo " features: ${deprecated_features}" -fi - # Create list of config switches that should be poisoned in common code... # but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null) diff --git a/configs/targets/ppc64abi32-linux-user.mak b/configs/targets/ppc64abi32-linux-user.mak deleted file mode 100644 index 0945451081..0000000000 --- a/configs/targets/ppc64abi32-linux-user.mak +++ /dev/null @@ -1,8 +0,0 @@ -TARGET_ARCH=ppc64 -TARGET_ABI32=y -TARGET_BASE_ARCH=ppc -TARGET_ABI_DIR=ppc -TARGET_SYSTBL_ABI=common,nospu,32 -TARGET_SYSTBL=syscall.tbl -TARGET_WORDS_BIGENDIAN=y -TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h index 8b364697d4..7df9118937 100644 --- a/linux-user/ppc/target_syscall.h +++ b/linux-user/ppc/target_syscall.h @@ -36,7 +36,7 @@ struct target_pt_regs { abi_ulong link; abi_ulong xer; abi_ulong ccr; -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) abi_ulong softe; #else abi_ulong mq; /* 601 only (not used at present) */ @@ -58,7 +58,7 @@ struct target_revectored_struct { * flags masks */ -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) #ifdef TARGET_WORDS_BIGENDIAN #define UNAME_MACHINE "ppc64" #else diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index cca561f622..dc7dcad6f7 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1607,7 +1607,7 @@ struct target_stat64 { struct target_stat { abi_ulong st_dev; abi_ulong st_ino; -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) abi_ulong st_nlink; unsigned int st_mode; #else @@ -1628,12 +1628,12 @@ struct target_stat { abi_ulong target_st_ctime_nsec; abi_ulong __unused4; abi_ulong __unused5; -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) abi_ulong __unused6; #endif }; -#if !defined(TARGET_PPC64) || defined(TARGET_ABI32) +#if !defined(TARGET_PPC64) #define TARGET_HAS_STRUCT_STAT64 struct QEMU_PACKED target_stat64 { unsigned long long st_dev; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index cb2f01ff01..107796c44d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -718,7 +718,7 @@ static inline void init_thread(struct target_pt_regs *regs, #define ELF_MACHINE PPC_ELF_MACHINE #define ELF_START_MMAP 0x80000000 -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) #define elf_check_arch(x) ( (x) == EM_PPC64 ) @@ -870,7 +870,7 @@ static uint32_t get_elf_hwcap2(void) static inline void init_thread(struct target_pt_regs *_regs, struct image_info *infop) { _regs->gpr[1] = infop->start_stack; -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) if (get_ppc64_abi(infop) < 2) { uint64_t val; get_user_u64(val, infop->entry + 8); diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c index 176c9d8503..ec0b9c0df3 100644 --- a/linux-user/ppc/signal.c +++ b/linux-user/ppc/signal.c @@ -477,9 +477,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, int i, err = 0; #if defined(TARGET_PPC64) struct target_sigcontext *sc = 0; -#if !defined(TARGET_ABI32) struct image_info *image = ((TaskState *)thread_cpu->opaque)->info; -#endif #endif rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf)); @@ -530,7 +528,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, env->gpr[5] = (target_ulong) h2g(&rt_sf->uc); env->gpr[6] = (target_ulong) h2g(rt_sf); -#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) +#if defined(TARGET_PPC64) if (get_ppc64_abi(image) < 2) { /* ELFv1 PPC64 function pointers are pointers to OPD entries. */ struct target_func_ptr *handler = @@ -562,7 +560,7 @@ sigsegv: } -#if !defined(TARGET_PPC64) || defined(TARGET_ABI32) +#if !defined(TARGET_PPC64) long do_sigreturn(CPUPPCState *env) { struct target_sigcontext *sc = NULL; @@ -575,12 +573,9 @@ long do_sigreturn(CPUPPCState *env) if (!lock_user_struct(VERIFY_READ, sc, sc_addr, 1)) goto sigsegv; -#if defined(TARGET_PPC64) - set.sig[0] = sc->oldmask + ((uint64_t)(sc->_unused[3]) << 32); -#else __get_user(set.sig[0], &sc->oldmask); __get_user(set.sig[1], &sc->_unused[3]); -#endif + target_to_host_sigset_internal(&blocked, &set); set_sigmask(&blocked); diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 8f2a3c8f5b..0aa70213fb 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -473,33 +473,6 @@ tsan-build: TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=1 -# These targets are on the way out -build-deprecated: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools - MAKE_CHECK_ARGS: build-tcg - TARGETS: ppc64abi32-linux-user - artifacts: - expire_in: 2 days - paths: - - build - -# We split the check-tcg step as test failures are expected but we still -# want to catch the build breaking. -check-deprecated: - extends: .native_test_job_template - needs: - - job: build-deprecated - artifacts: true - variables: - IMAGE: debian-all-test-cross - MAKE_CHECK_ARGS: check-tcg - allow_failure: true - # gprof/gcov are GCC features build-gprof-gcov: extends: .native_build_job_template diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 1146a06be6..5de12b01cd 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -16,7 +16,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- -ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user +ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user # Install extra libraries to increase code coverage RUN apt update && \ diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 309335a2bd..763e9b6ad8 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -167,7 +167,7 @@ for target in $target_list; do container_image=debian-nios2-cross container_cross_cc=nios2-linux-gnu-gcc ;; - ppc-*|ppc64abi32-*) + ppc-*) container_hosts=x86_64 container_image=debian-powerpc-test-cross container_cross_cc=powerpc-linux-gnu-gcc-10 -- 2.30.2

2 2

[PATCH] virhostcpu: fix getting CPU freq for Apple Silicon
by Menci 05 Feb '22

05 Feb '22

The current implementation of virHostCPUGetInfo for macOS (__APPLE__) reads "hw.cpufrequency" from sysctl, which is available only on x86_64 architecture. On Apple Silicon ARM Macs, it's not available: $ sysctl hw.cpufrequency # No output $ arch -x86_64 sysctl hw.cpufrequency # Run with Rosetta 2 hw.cpufrequency: 2400000000 When running libvirtd on Apple Silicon, I got the error: cannot obtain CPU freq: No such file or directory. To fix it, we can calculate it with "hw.tbfrequency" and "kern.clockrate" instead: $ sysctl hw.tbfrequency hw.tbfrequency: 24000000 $ sysctl kern.clockrate kern.clockrate: { hz = 100, tick = 10000, tickadj = 0, profhz = 100, stathz = 100 } The result value would be hw.tbfrequency * kern.clockrate.hz. Signed-off-by: Menci <huanghaorui301(a)gmail.com> --- src/util/virhostcpu.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index a07c00a0e9..72983c91f3 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -927,9 +927,18 @@ virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED, *mhz = cpu_freq; # else + /* This works for Intel Macs */ if (sysctlbyname("hw.cpufrequency", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { - virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); - return -1; + /* On Apple Silicon fallback to hw.tbfrequency and kern.clockrate.hz */ + struct clockinfo clockrate; + size_t clockrate_len = sizeof(clockrate); + if (sysctlbyname("hw.tbfrequency", &cpu_freq, &cpu_freq_len, NULL, 0) < 0 || + sysctlbyname("kern.clockrate", &clockrate, &clockrate_len, NULL, 0) < 0) { + virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); + return -1; + } + + cpu_freq *= clockrate.hz; } *mhz = cpu_freq / 1000000; -- 2.34.1

1 0

[libvirt PATCH 00/14] qemu: Improve swtpm internal API
by Andrea Bolognani 04 Feb '22

04 Feb '22

Clean up inconsistencies to make navigating the module easier. Andrea Bolognani (14): qemu: Rename qemuExtTPMStartEmulator() qemu: Fully document qemuTPMEmulatorStart() qemu: Rename qemuTPM{Create,Delete}EmulatorStorage() qemu: Document qemuTPMEmulatorDeleteStorage() qemu: Drop qemuTPMEmulatorInitStorage() qemu: Make qemuTPMEmulatorCreateStorage() take a virDomainTPMDef* qemu: Introduce qemuExtTPMEmulatorSetupCgroup() qemu: Introduce qemuTPMEmulatorCleanupHost() qemu: Rename path-building functions qemu: Call virDomainDefGetShortName() less frequently qemu: Fix description of swtpmStateDir qemu: Move utility functions close together qemu: Move entry points close together qemu: Move high-level actions close together src/qemu/qemu_tpm.c | 606 +++++++++++++++++++++++--------------------- 1 file changed, 323 insertions(+), 283 deletions(-) -- 2.34.1

2 15

[PATCH 0/2] qemu_process: Start QEMU for caps probing more robustly
by Michal Privoznik 04 Feb '22

04 Feb '22

I'm not going to lie, my true motive is to be able to have a very small bash wrapper that spawns QEMU under valgrind, e.g. like this: #!/bin/bash exec /usr/bin/valgrind --tool=memcheck --leak-check=full \ --track-fds=yes --log-file=/tmp/valgrind_qemu.log \ qemu-system-x86_64 "$@" But if a malicious user provides slightly different script (see 2/2) then they can starve libvirt worker pool. Hence, we have two reasons for merging these. Michal Prívozník (2): qemu_process: Be nicer to killing QEMU when probing caps qemu_process: Start QEMU for caps probing more robustly src/qemu/qemu_process.c | 64 +++++++++++++++++++++++++++-------------- src/qemu/qemu_process.h | 1 - 2 files changed, 43 insertions(+), 22 deletions(-) -- 2.34.1

1 2

[PATCH] qemu: Validate domain definition even on migration
by Michal Privoznik 04 Feb '22

04 Feb '22

When we are about to spawn QEMU, we validate the domain definition against qemuCaps. Except when domain is/was already running before (i.e. on incoming migration, snapshots, resume from a file). However, especially on incoming migration it may happen that the destination QEMU is different to the source QEMU, e.g. the destination QEMU may have some devices disabled. And we have a function that validates devices/features requested in domain XML against the desired QEMU capabilities (aka qemuCaps) - it's virDomainDefValidate() which calls qemuValidateDomainDef() and qemuValidateDomainDeviceDef() subsequently. But the problem here is that the validation function is explicitly skipped over in specific scenarios (like incoming migration, restore from a snapshot or previously saved file). This in turn means that we may spawn QEMU and request device/features it doesn't support. When that happens QEMU fails to load migration stream: qemu-kvm: ... 'virtio-mem-pci' is not a valid device model name (NB, while the example shows one particular device, the problem is paramount) This problem is easier to run into since we are slowly moving validation from qemu_command.c into said validation functions. The solution is simple: do the validation in all cases. And while it may happen that users would be unable to migrate/restore a guest due to a bug in our validator, spawning QEMU without validation is worse (especially when you consider that users can supply their own XMLs for migrate/restore operations - these were never validated). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2048435 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically, this is v2 of: https://listman.redhat.com/archives/libvir-list/2022-January/msg01307.html but since it implements completely different approach I've reset the counter. src/qemu/qemu_process.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c13280c8f3..ea586e54c1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5399,11 +5399,7 @@ qemuProcessStartValidate(virQEMUDriver *driver, } - /* Checks below should not be executed when starting a qemu process for a - * VM that was running before (migration, snapshots, save). It's more - * important to start such VM than keep the configuration clean */ - if ((flags & VIR_QEMU_PROCESS_START_NEW) && - virDomainDefValidate(vm->def, 0, driver->xmlopt, qemuCaps) < 0) + if (virDomainDefValidate(vm->def, 0, driver->xmlopt, qemuCaps) < 0) return -1; if (qemuProcessStartValidateGraphics(vm) < 0) -- 2.34.1

2 1

[PATCH v3 0/3] qemu_tpm: Get swtpm pid without binary validation
by Vasiliy Ulyanov 04 Feb '22

04 Feb '22

[v1] https://listman.redhat.com/archives/libvir-list/2022-January/msg00008.html [v2] https://listman.redhat.com/archives/libvir-list/2022-January/msg00582.html As suggesed in the review comments: - dropped virFileGetLockOwner; - simplified lock validation by using VIR_AUTOCLOSE and just trying to lock the file; - introduced virPidFileReadPathIfLocked to preserve the existing behaviour of virPidFileReadPathIfAlive. Vasiliy Ulyanov (3): virpidfile: Add virPidFileReadPathIfLocked func qemu: tpm: Get swtpm pid without binary validation qemu: gpu: Get pid without binary validation src/libvirt_private.syms | 1 + src/qemu/qemu_tpm.c | 40 +++++++++++++++++++++------------- src/qemu/qemu_vhost_user_gpu.c | 11 +++++----- src/util/virpidfile.c | 34 +++++++++++++++++++++++++++++ src/util/virpidfile.h | 2 ++ 5 files changed, 67 insertions(+), 21 deletions(-) -- 2.34.1

3 9

[libvirt PATCH] conf: Fix documentation for virDomainDefGetShortName()
by Andrea Bolognani 03 Feb '22

03 Feb '22

The @unique argument didn't exist even when the function was introduced in a042275a396e, and the @vm argument was not renamed when the function was changed to take a virDomainDef* instead of a virDomainObj* in 7ed6934f3b92. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 467f708350..d66496c9b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30086,8 +30086,7 @@ virDomainDefHasMemballoon(const virDomainDef *def) /** * virDomainDefGetShortName: - * @vm: Machine for which to get a name - * @unique: Make sure the name is unique (use id as well) + * @def: domain definition * * Shorten domain name to avoid possible path length limitations. */ -- 2.34.1

2 1

[libvirt PATCH v8 0/3] Ignore EPERM on implicit clearing of VF VLAN ID
by Dmitrii Shcherbakov 03 Feb '22

03 Feb '22

SmartNIC DPUs may not expose some privileged eswitch operations to the hypervisor hosts. For example, this happens with Bluefield devices running in the ECPF (default) mode [1] for security reasons. While VF MAC address programming is possible via an RTM_SETLINK operation, trying to set a VLAN ID in the same operation may fail with EPERM. Specifically for the mlx5 driver this behavior was altered in the Linux kernel upstream [2] to avoid getting EPERM when trying to program VLAN 0. This may also get backported to older downstream kernels (e.g. [3]). However, Libvirt could potentially handle this case gracefully without needing a specific kernel version or depending on a specific driver fix. In the kernel a relevant call chain may look like do_setlink -> do_setvfinfo -> dev->netdev_ops->set_vf_vlan which calls a driver-specific function like [4] eventually. The equivalent ip link commands below provide an illustration: 1. This will work without an error: sudo ip link set enp130s0f0 vf 2 mac de:ad:be:ef:ca:fe 2. Setting (or clearing) a VLAN will fail with EPERM: sudo ip link set enp130s0f0 vf 2 vlan 0 RTNETLINK answers: Operation not permitted 3. This is what Libvirt attempts to do today when trying to clear a VF VLAN at the same time as programming a VF MAC: sudo ip link set enp130s0f0 vf 2 vlan 0 mac de:ad:be:ef:ca:fe RTNETLINK answers: Operation not permitted If setting an explicit VLAN ID results in an EPERM, clearing a VLAN (setting a VLAN ID to 0) can be handled gracefully by ignoring the EPERM error with the rationale being that if we cannot set this state in the first place, we cannot clear it either. Thus, virNetDevSetVfConfig is split into two distinct functions. If clearing a VLAN ID fails with EPERM when clearing is implicit, the error is simply ignored. For explicit clearing EPERM is still a fatal error. Both new functions rely virNetDevSendVfSetLinkRequest that implements common functionality related to formatting a request, sending it and handling error conditions and returns 0 or an error since in both cases the payload is either NLMSG_DONE (no error) or NLMSG_ERROR where an error message is needed by the caller to handle known cases appropriately. This function allows the conditional code to be unit tested. An alternative to this could be providing a higher level control plane mechanism that would provide metadata about a device being remotely managed in which case Libvirt would avoid trying to set or clear a VLAN ID. This would be more complicated since other software (like Nova in the OpenStack case) would have to annotate every guest device with an attribute indicating whether a device is remotely managed or not based on operator provided configuration so that Libvirt can act on this and avoid VLAN programming. https://gitlab.com/dmitriis/libvirt/-/pipelines/460293963 v8 change: * Rebased on top of the latest changes to Libvirt; * Added relevant upstream Linux and downstream kernel references to this cover letter. [1] https://docs.mellanox.com/display/BlueFieldSWv35111601/Modes+of+Operation#M… [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… [3] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1957753 [4] https://github.com/torvalds/linux/blob/v5.15/drivers/net/ethernet/mellanox/… Dmitrii Shcherbakov (3): Set VF MAC and VLAN ID in two different operations Allow VF vlanid to be passed as a pointer Ignore EPERM on implicit clearing of VF VLAN ID NEWS.rst | 14 ++ src/hypervisor/virhostdev.c | 4 +- src/libvirt_private.syms | 7 + src/util/virnetdev.c | 256 +++++++++++++++++++++++++----------- src/util/virnetdevpriv.h | 44 +++++++ tests/virnetdevtest.c | 249 ++++++++++++++++++++++++++++++++++- 6 files changed, 496 insertions(+), 78 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

3 14

[libvirt PATCH] docs: Add example for isa-debugcon
by Andrea Bolognani 03 Feb '22

03 Feb '22

Most people will want to use isa-debugcon to obtain debug output for SeaBIOS / EDK II, so let's include a ready-made example for that scenario in our documentation. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 8fa5940469..583c195568 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6395,6 +6395,14 @@ Serial port <source path='/dev/pts/3'/> <target port='0'/> </serial> +  + <serial type='pty'> + <target type='isa-debug'> + <model type='isa-debugcon'/> + </target> + <address type='isa' iobase='0x402'/> + </console> + </devices> ... -- 2.34.1

2 1

[libvirt PATCH] syntax-check: Suggest correct replacement for str(n)dup()
by Andrea Bolognani 03 Feb '22

03 Feb '22

As of 610963cd0411 VIR_STRDUP() no longer exists. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- build-aux/syntax-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index d5cdb3c70e..b96d126bdc 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -244,7 +244,7 @@ sc_prohobit_vsnprintf: sc_prohibit_strdup: @prohibit='\<strn?dup\> *\(' \ - halt='use VIR_STRDUP, not strdup' \ + halt='use g_str(n)dup, not str(n)dup' \ $(_sc_search_regexp) # Prefer virSetUIDGID. -- 2.34.1

2 1

[libvirt PATCH] util: Reorder virStringParseVersion() arguments
by Andrea Bolognani 03 Feb '22

03 Feb '22

In order to match the existing virStringParse*() and virStrTo*() functions, input arguments should come before output arguments. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/bhyve/bhyve_driver.c | 2 +- src/ch/ch_conf.c | 2 +- src/esx/esx_vi.c | 8 ++++---- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ++-- src/openvz/openvz_conf.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virfirewalld.c | 2 +- src/util/virstring.c | 10 +++++----- src/util/virstring.h | 6 +++--- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/vz/vz_utils.c | 2 +- tests/testutilsqemu.c | 2 +- tests/utiltest.c | 4 ++-- tools/virt-host-validate-common.c | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 578fcfe1d2..1cf0b2abce 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -267,7 +267,7 @@ bhyveConnectGetVersion(virConnectPtr conn, unsigned long *version) uname(&ver); - if (virStringParseVersion(version, ver.release, true) < 0) { + if (virStringParseVersion(ver.release, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release); return -1; diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 88a23a59cd..41d753fd21 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -204,7 +204,7 @@ chExtractVersion(virCHDriver *driver) return -1; } - if (virStringParseVersion(&version, tmp, true) < 0) { + if (virStringParseVersion(tmp, true, &version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse cloud-hypervisor version: %s"), tmp); return -1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 36e9dc1d2c..1ea81a649c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -868,8 +868,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (virStringParseVersion(&ctx->apiVersion, - ctx->service->about->apiVersion, true) < 0) { + if (virStringParseVersion(ctx->service->about->apiVersion, true, + &ctx->apiVersion) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse VI API version '%s'"), ctx->service->about->apiVersion); @@ -883,8 +883,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (virStringParseVersion(&ctx->productVersion, - ctx->service->about->version, true) < 0) { + if (virStringParseVersion(ctx->service->about->version, true, + &ctx->productVersion) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse product version '%s'"), ctx->service->about->version); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3d17b87e8c..51596a820c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1656,7 +1656,7 @@ static int lxcConnectGetVersion(virConnectPtr conn, unsigned long *version) if (virConnectGetVersionEnsureACL(conn) < 0) return -1; - if (virStringParseVersion(version, ver.release, true) < 0) { + if (virStringParseVersion(ver.release, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release); return -1; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 54065a0f75..7798dc47b0 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3655,7 +3655,7 @@ ebiptablesDriverProbeCtdir(void) } /* following Linux lxr, the logic was inverted in 2.6.39 */ - if (virStringParseVersion(&thisversion, utsname.release, true) < 0) { + if (virStringParseVersion(utsname.release, true, &thisversion) < 0) { VIR_ERROR(_("Could not determine kernel version from string %s"), utsname.release); return; @@ -3688,7 +3688,7 @@ ebiptablesDriverProbeStateMatchQuery(virFirewall *fw G_GNUC_UNUSED, * 'iptables v1.4.16' */ if (!(tmp = strchr(lines[0], 'v')) || - virStringParseVersion(version, tmp + 1, true) < 0) { + virStringParseVersion(tmp + 1, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse version string '%s'"), lines[0]); diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 191c79e1e2..c85829be86 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -85,7 +85,7 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion) if ((tmp = STRSKIP(tmp, "vzctl version ")) == NULL) return -1; - if (virStringParseVersion(&version, tmp, true) < 0) + if (virStringParseVersion(tmp, true, &version) < 0) return -1; if (retversion) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index fd4efa802c..3467d8e4e0 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -614,7 +614,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf) virSkipToDigit(&p); - if (virStringParseVersion(&version, p, true) < 0) + if (virStringParseVersion(p, true, &version) < 0) goto error; if (version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) { diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index c909901833..05a8f4e714 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -107,7 +107,7 @@ virFirewallDGetVersion(unsigned long *version) g_variant_get(reply, "(v)", &gvar); g_variant_get(gvar, "&s", &versionStr); - if (virStringParseVersion(version, versionStr, false) < 0) { + if (virStringParseVersion(versionStr, false, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse firewalld version '%s'"), versionStr); diff --git a/src/util/virstring.c b/src/util/virstring.c index ad0b158ad4..ee0fe7fc9e 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1023,10 +1023,10 @@ int virStringParseYesNo(const char *str, bool *result) /** * virStringParseVersion: - * @version: unsigned long pointer to output the version number * @str: const char pointer to the version string * @allowMissing: true to treat 3 like 3.0.0, false to error out on - * missing minor or micro + * missing minor or micro + * @version: unsigned long pointer to output the version number * * Parse an unsigned version number from a version string. Expecting * 'major.minor.micro' format, ignoring an optional suffix. @@ -1038,9 +1038,9 @@ int virStringParseYesNo(const char *str, bool *result) * Returns the 0 for success, -1 for error. */ int -virStringParseVersion(unsigned long *version, - const char *str, - bool allowMissing) +virStringParseVersion(const char *str, + bool allowMissing, + unsigned long *version) { unsigned int major, minor = 0, micro = 0; char *tmp; diff --git a/src/util/virstring.h b/src/util/virstring.h index ec8ceb0022..6334c4f177 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -136,6 +136,6 @@ int virStringParseYesNo(const char *str, bool *result) G_GNUC_WARN_UNUSED_RESULT; -int virStringParseVersion(unsigned long *version, - const char *str, - bool allowMissing); +int virStringParseVersion(const char *str, + bool allowMissing, + unsigned long *version); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index eec47a02fc..ccb719c69d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -170,7 +170,7 @@ vboxExtractVersion(void) gVBoxAPI.UPFN.Utf16ToUtf8(vbox_driver->pFuncs, versionUtf16, &vboxVersion); - if (virStringParseVersion(&vbox_driver->version, vboxVersion, false) >= 0) + if (virStringParseVersion(vboxVersion, false, &vbox_driver->version) >= 0) ret = 0; gVBoxAPI.UPFN.Utf8Free(vbox_driver->pFuncs, vboxVersion); diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ebba435cc4..e449d7dcc7 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -229,7 +229,7 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version) return -1; } - if (virStringParseVersion(version, tmp, false) < 0) { + if (virStringParseVersion(tmp, false, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("version parsing error")); return -1; diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index fcf6d363a9..c4edf9f673 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -182,7 +182,7 @@ vzInitVersion(struct _vzDriver *driver) } tmp[0] = '\0'; - if (virStringParseVersion(&(driver->vzVersion), sVer, true) < 0) { + if (virStringParseVersion(sVer, true, &(driver->vzVersion)) < 0) { vzParseError(); goto cleanup; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 646ef415d1..59044bd915 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -695,7 +695,7 @@ testQemuGetLatestCapsForArch(const char *arch, if (!virStringStripSuffix(tmp, fullsuffix)) continue; - if (virStringParseVersion(&ver, tmp, false) < 0) { + if (virStringParseVersion(tmp, false, &ver) < 0) { VIR_TEST_DEBUG("skipping caps file '%s'", ent->d_name); continue; } diff --git a/tests/utiltest.c b/tests/utiltest.c index 419dfea913..59f87f7cf2 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -151,8 +151,8 @@ testParseVersionString(const void *data G_GNUC_UNUSED) unsigned long version; for (i = 0; i < G_N_ELEMENTS(versions); ++i) { - result = virStringParseVersion(&version, versions[i].string, - versions[i].allowMissing); + result = virStringParseVersion(versions[i].string, + versions[i].allowMissing, &version); if (result != versions[i].result) { VIR_TEST_DEBUG("\nVersion string [%s]", versions[i].string); diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 2ac96d1e19..7c2cb8b908 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -267,7 +267,7 @@ int virHostValidateLinuxKernel(const char *hvname, return VIR_HOST_VALIDATE_FAILURE(level); } - if (virStringParseVersion(&thisversion, uts.release, true) < 0) { + if (virStringParseVersion(uts.release, true, &thisversion) < 0) { virHostMsgFail(level, "%s", hint); return VIR_HOST_VALIDATE_FAILURE(level); } -- 2.34.1

3 3

[libvirt PATCH v3] NEWS: add note about the ISA debug console
by Daniel P. Berrangé 03 Feb '22

03 Feb '22

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 666a593b58..d00bda5d50 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -22,6 +22,12 @@ v8.1.0 (unreleased) It works on Intel machines as well as recent machines powered by Apple Silicon. QEMU 6.2.0 is needed for Apple Silicon support. + * qemu: the isa-debugcon device is now supported + + The <serial> element accepts a ``isa-debug`` as a target type + to configure the QEMU ISA debug console, for receiving messages + from the firmware. + * **Improvements** * packaging: sysconfig files no longer installed -- 2.34.1

2 1

[PATCH 0/3] network: Generate TFTP config regardless of DHCP
by Michal Privoznik 03 Feb '22

03 Feb '22

See 3/3 for explanation. Michal Prívozník (3): network: Initialize variables in networkDnsmasqConfContents() network: Separate DHCP config generator into a function network: Generate TFTP config regardless of DHCP src/network/bridge_driver.c | 262 ++++++++++-------- .../networkxml2confdata/netboot-network.conf | 4 +- tests/networkxml2confdata/netboot-tftp.conf | 13 + tests/networkxml2confdata/netboot-tftp.xml | 9 + tests/networkxml2conftest.c | 1 + tests/networkxml2xmlin/netboot-tftp.xml | 1 + tests/networkxml2xmlout/netboot-tftp.xml | 1 + tests/networkxml2xmltest.c | 1 + 8 files changed, 172 insertions(+), 120 deletions(-) create mode 100644 tests/networkxml2confdata/netboot-tftp.conf create mode 100644 tests/networkxml2confdata/netboot-tftp.xml create mode 120000 tests/networkxml2xmlin/netboot-tftp.xml create mode 120000 tests/networkxml2xmlout/netboot-tftp.xml -- 2.32.0

2 4

[libvirt PATCH] meson: Don't overwrite includedir
by Andrea Bolognani 03 Feb '22

03 Feb '22

The current implementation of the workaround for yajl's broken pkg-config file accidentally overwrites the value of includedir that is later used by the installation process. Rename the local variable to avoid this issue. Fixes: c97075e1e46e9305d62620d8b05046aae0139438 Closes: https://gitlab.com/libvirt/libvirt/-/issues/271 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 0e6f0f22fc..9016c0458a 100644 --- a/meson.build +++ b/meson.build @@ -1325,18 +1325,18 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() != 'linux' - includedir = yajl_dep.get_pkgconfig_variable('includedir') - if includedir.contains('include/yajl') + yajl_includedir = yajl_dep.get_pkgconfig_variable('includedir') + if yajl_includedir.contains('include/yajl') rc = run_command( 'python3', '-c', 'print("@0@".replace("@1@", "@2@"))'.format( - includedir, 'include/yajl', 'include', + yajl_includedir, 'include/yajl', 'include', ), check: true, ) - includedir = rc.stdout().strip() + yajl_includedir = rc.stdout().strip() yajl_dep = declare_dependency( - compile_args: [ '-I' + includedir ], + compile_args: [ '-I' + yajl_includedir ], dependencies: [ yajl_dep ], ) endif -- 2.34.1

2 1

[libvirt PATCH v2 0/3] qemu: support the SeaBIOS/EDK2 debug console
by Daniel P. Berrangé 03 Feb '22

03 Feb '22

# virsh dumpxml fedora34x86_64 | xmllint -xpath '/domain/devices/console[2]' - <serial type="pty"> <target type="isa-debug"> <model type="isa-debugcon"/> </target> <address type="isa" iobase="0x402"/> </serial> # virsh console --devname console1 fedora34x86_64 Of course you really want to start the guest paused initially to allow time to connect to the console before resuming CPUs, and thus be able to catch early firmware output. In v2: - Use <serial> instead of <console> Daniel P. Berrangé (3): conf: validate serial port model in ABI checks conf: support firmware ISA debug console qemu: add tests for the ISA debug console command line docs/formatdomain.rst | 14 +++--- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 26 +++++++++-- src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 4 ++ src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_validate.c | 5 +++ .../serial-debugcon.x86_64-latest.args | 39 +++++++++++++++++ tests/qemuxml2argvdata/serial-debugcon.xml | 29 +++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/serial-debugcon.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-debugcon.xml create mode 100644 tests/qemuxml2xmloutdata/serial-debugcon.xml -- 2.34.1

3 12

[libvirt PATCH v5 0/9] Automatic mutex management
by Tim Wiederhake 02 Feb '22

02 Feb '22

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html V2: https://listman.redhat.com/archives/libvir-list/2021-September/msg00249.html V3: https://listman.redhat.com/archives/libvir-list/2021-September/msg00964.html V4: https://listman.redhat.com/archives/libvir-list/2022-January/msg01262.html Changes since V4: * Replaced usage of "__LINE__" with "__COUNTER__" Regards, Tim Tim Wiederhake (9): internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardLock virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 ++-- src/conf/virchrdev.c | 12 +++++------- src/internal.h | 3 +++ src/libvirt_private.syms | 3 +++ src/lxc/lxc_driver.c | 6 +++--- src/util/virobject.c | 16 ++++++++++++++++ src/util/virobject.h | 26 ++++++++++++++++++++++++++ src/util/virthread.c | 15 +++++++++++++++ src/util/virthread.h | 31 +++++++++++++++++++++++++++++++ 9 files changed, 104 insertions(+), 12 deletions(-) -- 2.31.1

4 25