September 2022 - Devel - libvirt List Archives

[PATCH 0/3] ppc64: QEMU 7.1 caps + use CAPS_LATEST in xml2argv
by Daniel Henrique Barboza 13 Oct '22

13 Oct '22

Hi, This series updates the remaining pseries tests in qemuxml2argvtest.c to use CAPS_LATEST instead of using a capability list for each test. First patch is the usual capability bump for the new QEMU release. Second patch converts the most simple cases of DO_TEST() to use DO_TEST_CAPS_LATEST(). The patch is rather big but the changes are trivial. Third patch is a change I figured it was worth making to avoid using DO_TEST() in the pseries feature parse error tests. After applying this series, there is no more DO_TEST() tests with 'pseries' in the name in qemuxml2argvtest.c. Daniel Henrique Barboza (3): tests: qemucapabilities: bump ppc64 caps with qemu 7.1.0 tests: change qemuxml2argv pseries tests to TEST_CAPS_LATEST tests: refactor pseries features parse failure tests tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 147 + .../caps_7.1.0.ppc64.replies | 35113 ++++++++++++++++ .../qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1109 + ...s.args => pseries-basic.ppc64-latest.args} | 11 +- .../pseries-console-native.args | 1 - .../pseries-console-native.ppc64-latest.args | 1 + ... pseries-console-virtio.ppc64-latest.args} | 11 +- ...s => pseries-cpu-compat.ppc64-latest.args} | 10 +- ...gs => pseries-cpu-exact.ppc64-latest.args} | 10 +- ....args => pseries-cpu-le.ppc64-latest.args} | 11 +- ...es-default-phb-numa-node.ppc64-latest.err} | 0 .../qemuxml2argvdata/pseries-features-ccf.xml | 15 +- .../pseries-features-cfpc.xml | 15 +- .../pseries-features-hpt-pagesize.xml | 17 +- .../qemuxml2argvdata/pseries-features-htm.xml | 15 +- .../qemuxml2argvdata/pseries-features-ibs.xml | 15 +- .../pseries-features-nested-hv.xml | 15 +- .../pseries-features-sbbc.xml | 15 +- ...rgs => pseries-features.ppc64-latest.args} | 7 +- .../pseries-hostdevs-1.ppc64-latest.args | 36 + .../pseries-hostdevs-2.ppc64-latest.args | 36 + .../qemuxml2argvdata/pseries-hostdevs-3.args | 32 - .../pseries-hostdevs-3.ppc64-latest.args | 35 + .../pseries-many-buses-1.args | 30 - ...=> pseries-many-buses-1.ppc64-latest.args} | 14 +- .../pseries-many-buses-2.args | 30 - ...=> pseries-many-buses-2.ppc64-latest.args} | 14 +- .../pseries-many-devices.args | 61 - .../pseries-many-devices.ppc64-latest.args | 64 + ...m.args => pseries-nvram.ppc64-latest.args} | 9 +- ...=> pseries-panic-address.ppc64-latest.err} | 0 .../pseries-panic-missing.ppc64-latest.args | 34 + ...pseries-panic-no-address.ppc64-latest.args | 34 + .../pseries-phb-default-missing.args | 30 - ...ies-phb-default-missing.ppc64-latest.args} | 12 +- ...> pseries-phb-numa-node.ppc64-latest.args} | 16 +- .../qemuxml2argvdata/pseries-phb-simple.args | 30 - ...s => pseries-phb-simple.ppc64-latest.args} | 12 +- .../pseries-serial+console-native.args | 1 - ...es-serial+console-native.ppc64-latest.args | 1 + .../pseries-serial-compat.args | 1 - .../pseries-serial-compat.ppc64-latest.args | 1 + ...> pseries-serial-native.ppc64-latest.args} | 9 +- ...s => pseries-serial-pci.ppc64-latest.args} | 9 +- ...s => pseries-serial-usb.ppc64-latest.args} | 11 +- .../qemuxml2argvdata/pseries-usb-default.args | 31 - .../pseries-usb-default.ppc64-latest.args | 34 + tests/qemuxml2argvdata/pseries-usb-kbd.args | 32 - .../pseries-usb-kbd.ppc64-latest.args | 35 + tests/qemuxml2argvdata/pseries-usb-multi.args | 32 - .../pseries-usb-multi.ppc64-latest.args | 35 + ...eries-vio-user-assigned.ppc64-latest.args} | 19 +- ...ned.args => pseries-vio.ppc64-latest.args} | 19 +- tests/qemuxml2argvtest.c | 213 +- 54 files changed, 36978 insertions(+), 572 deletions(-) create mode 100644 tests/domaincapsdata/qemu_7.1.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_7.1.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml rename tests/qemuxml2argvdata/{pseries-panic-no-address.args => pseries-basic.ppc64-latest.args} (58%) delete mode 120000 tests/qemuxml2argvdata/pseries-console-native.args create mode 120000 tests/qemuxml2argvdata/pseries-console-native.ppc64-latest.args rename tests/qemuxml2argvdata/{pseries-console-virtio.args => pseries-console-virtio.ppc64-latest.args} (57%) rename tests/qemuxml2argvdata/{pseries-cpu-compat.args => pseries-cpu-compat.ppc64-latest.args} (58%) rename tests/qemuxml2argvdata/{pseries-cpu-exact.args => pseries-cpu-exact.ppc64-latest.args} (59%) rename tests/qemuxml2argvdata/{pseries-cpu-le.args => pseries-cpu-le.ppc64-latest.args} (58%) rename tests/qemuxml2argvdata/{pseries-default-phb-numa-node.err => pseries-default-phb-numa-node.ppc64-latest.err} (100%) mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-ccf.xml mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-cfpc.xml mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-htm.xml mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-ibs.xml mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-nested-hv.xml mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-features-sbbc.xml rename tests/qemuxml2argvdata/{pseries-features.args => pseries-features.ppc64-latest.args} (68%) create mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args delete mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-3.args create mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args delete mode 100644 tests/qemuxml2argvdata/pseries-many-buses-1.args rename tests/qemuxml2argvdata/{pseries-hostdevs-2.args => pseries-many-buses-1.ppc64-latest.args} (57%) delete mode 100644 tests/qemuxml2argvdata/pseries-many-buses-2.args rename tests/qemuxml2argvdata/{pseries-hostdevs-1.args => pseries-many-buses-2.ppc64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/pseries-many-devices.args create mode 100644 tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args rename tests/qemuxml2argvdata/{pseries-nvram.args => pseries-nvram.ppc64-latest.args} (63%) rename tests/qemuxml2argvdata/{pseries-panic-address.err => pseries-panic-address.ppc64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args delete mode 100644 tests/qemuxml2argvdata/pseries-phb-default-missing.args rename tests/qemuxml2argvdata/{pseries-basic.args => pseries-phb-default-missing.ppc64-latest.args} (58%) rename tests/qemuxml2argvdata/{pseries-phb-numa-node.args => pseries-phb-numa-node.ppc64-latest.args} (53%) delete mode 100644 tests/qemuxml2argvdata/pseries-phb-simple.args rename tests/qemuxml2argvdata/{pseries-panic-missing.args => pseries-phb-simple.ppc64-latest.args} (58%) delete mode 120000 tests/qemuxml2argvdata/pseries-serial+console-native.args create mode 120000 tests/qemuxml2argvdata/pseries-serial+console-native.ppc64-latest.args delete mode 120000 tests/qemuxml2argvdata/pseries-serial-compat.args create mode 120000 tests/qemuxml2argvdata/pseries-serial-compat.ppc64-latest.args rename tests/qemuxml2argvdata/{pseries-serial-native.args => pseries-serial-native.ppc64-latest.args} (61%) rename tests/qemuxml2argvdata/{pseries-serial-pci.args => pseries-serial-pci.ppc64-latest.args} (60%) rename tests/qemuxml2argvdata/{pseries-serial-usb.args => pseries-serial-usb.ppc64-latest.args} (57%) delete mode 100644 tests/qemuxml2argvdata/pseries-usb-default.args create mode 100644 tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args delete mode 100644 tests/qemuxml2argvdata/pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args delete mode 100644 tests/qemuxml2argvdata/pseries-usb-multi.args create mode 100644 tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args rename tests/qemuxml2argvdata/{pseries-vio.args => pseries-vio-user-assigned.ppc64-latest.args} (52%) rename tests/qemuxml2argvdata/{pseries-vio-user-assigned.args => pseries-vio.ppc64-latest.args} (52%) -- 2.37.3

2 7

[PATCH 0/3] fix some issue in concurrency scenarios
by Jiang Jiacheng 12 Oct '22

12 Oct '22

Jiang Jiacheng (3): qemu: Init address before qemuProcessShutdownOrReboot during reconnect process qemu: get the stackManager lock before getting nested lock qemu: back up the path in qemuMonitorOpen src/qemu/qemu_conf.c | 6 +++++- src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_monitor.c | 5 ++++- src/qemu/qemu_process.c | 10 +++++----- 4 files changed, 17 insertions(+), 7 deletions(-) -- 2.33.0

2 7

[PATCH] Fix race condition when detaching a device
by Pierre LIBEAU 12 Oct '22

12 Oct '22

Qemu reply to libvirt "DeviceNotFound" and libvirt didn't clean on the side the live configuration. qemuMonitorDelDevice() return -2 to qemuDomainDeleteDevice() and during this action in qemuDomainDetachDeviceLive() the remove is never call. Ref #359 Signed-off-by: Pierre LIBEAU <pierre.libeau(a)corp.ovh.com> --- src/qemu/qemu_hotplug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b508dc8f0..52a14a4476 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -93,6 +93,8 @@ qemuDomainResetDeviceRemoval(virDomainObj *vm); * * Returns: 0 on success, * -1 otherwise. + * -2 device does not exist in qemu, but it still + * exists in libvirt */ static int qemuDomainDeleteDevice(virDomainObj *vm, @@ -124,7 +126,6 @@ qemuDomainDeleteDevice(virDomainObj *vm, * domain XML is queried right after detach API the * device would still be there. */ VIR_DEBUG("Detaching of device %s failed and no event arrived", alias); - rc = 0; } } @@ -6055,7 +6056,11 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, if (!async) qemuDomainMarkDeviceForRemoval(vm, info); - if (qemuDomainDeleteDevice(vm, info->alias) < 0) { + int rc; + rc = qemuDomainDeleteDevice(vm, info->alias); + if (rc < 0) { + if (rc == -2) + ret = qemuDomainRemoveDevice(driver, vm, &detach); if (virDomainObjIsActive(vm)) qemuDomainRemoveAuditDevice(vm, &detach, false); goto cleanup; -- 2.37.3

3 2

[PATCH v3] cpu_map: Introduce Neoverse N1/N2/V1
by Zhenyu Zhang 12 Oct '22

12 Oct '22

Add Neoverse N1/N2/V1 as a supported cpu model. Signed-off-by: Zhenyu Zhang <zhenyzha(a)redhat.com> v2: https://listman.redhat.com/archives/libvir-list/2022-September/234512.html v1: https://listman.redhat.com/archives/libvir-list/2022-September/234294.html Changelog ========= v3: * Remove the Ampere vendor from arm_vendors (Martin) * Change Neoverse N1/N2/V1 vendor from Ampere to ARM (Martin) v2: * Introduce Neoverse N1/N2/V1 (Martin) * Corrected ampere vendor value (Martin) --- src/cpu_map/arm_Neoverse-N1.xml | 6 ++++++ src/cpu_map/arm_Neoverse-N2.xml | 6 ++++++ src/cpu_map/arm_Neoverse-V1.xml | 6 ++++++ src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 3 +++ 5 files changed, 24 insertions(+) create mode 100644 src/cpu_map/arm_Neoverse-N1.xml create mode 100644 src/cpu_map/arm_Neoverse-N2.xml create mode 100644 src/cpu_map/arm_Neoverse-V1.xml diff --git a/src/cpu_map/arm_Neoverse-N1.xml b/src/cpu_map/arm_Neoverse-N1.xml new file mode 100644 index 0000000000..b83b8af8cc --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='ARM'/> + <pvr value='0xd0c'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Neoverse-N2.xml b/src/cpu_map/arm_Neoverse-N2.xml new file mode 100644 index 0000000000..cba2c6ca16 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N2'> + <vendor name='ARM'/> + <pvr value='0xd49'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Neoverse-V1.xml b/src/cpu_map/arm_Neoverse-V1.xml new file mode 100644 index 0000000000..a449322952 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-V1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-V1'> + <vendor name='ARM'/> + <pvr value='0xd40'/> + </model> +</cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..deae92552f 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -97,6 +97,9 @@ <include filename='arm_cortex-a53.xml'/> <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> + <include filename='arm_Neoverse-N1.xml'/> + <include filename='arm_Neoverse-N2.xml'/> + <include filename='arm_Neoverse-V1.xml'/>  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..55c3703006 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,9 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_Neoverse-N1.xml', + 'arm_Neoverse-N2.xml', + 'arm_Neoverse-V1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

2 1

[PATCH v2] rpc: fix memory leak in virNetServerClientNew and virNetServerProgramDispatchCall
by Jiang Jiacheng 04 Oct '22

04 Oct '22

From: jiangjiacheng <jiangjiacheng(a)huawei.com> In virNetServerProgramDispatchCall, The arg is passed as a void* and used to point to a certain struct depended on the dispatcher, so I think it's the memory of the struct's member that leaks and this memory shuld be freed by xdr_free. In virNetServerClientNew, client->rx is assigned by invoking virNetServerClientNew, but isn't freed if client->privateData's initialization failed, which leads to a memory leak. Thanks to Liang Peng's suggestion, put virNetMessageFree(client->rx) into virNetServerClientDispose() to release the memory. Signed-off-by: jiangjiacheng <jiangjiacheng(a)huawei.com> --- src/rpc/virnetserverclient.c | 2 ++ src/rpc/virnetserverprogram.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index a7d2dfa795..30f6af7be5 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -931,6 +931,8 @@ void virNetServerClientDispose(void *obj) PROBE(RPC_SERVER_CLIENT_DISPOSE, "client=%p", client); + if (client->rx) + virNetMessageFree(client->rx); if (client->privateData) client->privateDataFreeFunc(client->privateData); diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 3ddf9f0428..a813e821a3 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -409,11 +409,15 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, if (virNetMessageDecodePayload(msg, dispatcher->arg_filter, arg) < 0) goto error; - if (!(identity = virNetServerClientGetIdentity(client))) + if (!(identity = virNetServerClientGetIdentity(client))) { + xdr_free(dispatcher->arg_filter, arg); goto error; + } - if (virIdentitySetCurrent(identity) < 0) + if (virIdentitySetCurrent(identity) < 0) { + xdr_free(dispatcher->arg_filter, arg); goto error; + } /* * When the RPC handler is called: @@ -427,8 +431,10 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, */ rv = (dispatcher->func)(server, client, msg, &rerr, arg, ret); - if (virIdentitySetCurrent(NULL) < 0) + if (virIdentitySetCurrent(NULL) < 0) { + xdr_free(dispatcher->arg_filter, arg); goto error; + } /* * If rv == 1, this indicates the dispatch func has -- 2.27.0

3 7

[libvirt PATCH v2 00/16] Use nbdkit for http/ftp/ssh network drives in libvirt
by Jonathon Jongsma 04 Oct '22

04 Oct '22

After a bit of a lengthy delay, this is the second version of this patch series. See https://bugzilla.redhat.com/show_bug.cgi?id=2016527 for more information about the goal, but the summary is that RHEL does not want to ship the qemu storage plugins for curl and ssh. Handling them outside of the qemu process provides several advantages such as reduced attack surface and stability. A quick summary of the code: - at startup I query to see whether nbdkit exists on the host and if so, I query which plugins/filters are installed. These capabilities are cached and stored in the qemu driver - When the driver prepares the domain, we go through each disk source and determine whether the nbdkit capabilities allow us to support this disk via nbdkit, and if so, we allocate a qemuNbdkitProcess object and stash it in the private data of the virStorageSource. - The presence or absence of this qemuNbdkitProcess data then indicates whether this disk will be served to qemu indirectly via nbdkit or directly - When we launch the qemuProcess, as part of the "external device start" step, I launch a ndkit process for each disk that is supported by nbdkit. - for devices which are served by an intermediate ndkit process, I change the qemu commandline in the following ways: - I no longer pass auth/cookie secrets to qemu (those are handled by nbdkit) - I replace the actual network URL of the remote disk source with the path to the nbdkit unix socket Open questions - selinux: I need some help from people more familiar with selinux to figure out what is needed here. When selinux is enforcing, I get a failure to launch nbdkit to serve the disks. I suspect we need a new context and policy for /usr/sbin/nbdkit that allows it to transition to the appropriate selinux context. The current context (on fedora) is "system_u:object_r:bin_t:s0". When I (temporarily) change the context to something like qemu_exec_t, I am able to start nbdkit and the domain launches. Known shortcomings - creating disks (in ssh) still isn't supported. I wanted to send out the patch series anyway since it's been delayed too long already. Changes since v1: - split into multiple patches - added a build option for nbdkit_moddir - don't instantiate any secret / cookie props for disks that are being served by nbdkit since we don't send secrets to qemu anymore - ensure that nbdkit processes are started/stopped for the entire backing chain - switch to virFileCache-based capabilities for nbdkit so that we don't need to requery every time - switch to using pipes for communicating sensitive data to nbdkit - use pidfile support built into virCommand rather than nbdkit's --pidfile argument - added significantly more tests Jonathon Jongsma (16): schema: allow 'ssh' as a protocol for network disks qemu: Add qemuNbdkitCaps to qemu driver qemu: expand nbdkit capabilities util: Allow virFileCache data to be any GObject qemu: implement basic virFileCache for nbdkit caps qemu: implement persistent file cache for nbdkit caps qemu: use file cache for nbdkit caps qemu: Add qemuNbdkitProcess qemu: add functions to start and stop nbdkit tests: add ability to test various nbdkit capabilities qemu: split qemuDomainSecretStorageSourcePrepare qemu: use nbdkit to serve network disks if available qemu: include nbdkit state in private xml tests: add tests for nbdkit invocation qemu: pass sensitive data to nbdkit via pipe qemu: add test for authenticating a https network disk build-aux/syntax-check.mk | 4 +- docs/formatdomain.rst | 2 +- meson.build | 6 + meson_options.txt | 1 + po/POTFILES | 1 + src/conf/schemas/domaincommon.rng | 1 + src/qemu/meson.build | 1 + src/qemu/qemu_block.c | 168 ++- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.c | 22 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 176 ++- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_extdevice.c | 84 ++ src/qemu/qemu_nbdkit.c | 1051 +++++++++++++++++ src/qemu/qemu_nbdkit.h | 90 ++ src/qemu/qemu_nbdkitpriv.h | 46 + src/util/virfilecache.c | 15 +- src/util/virfilecache.h | 2 +- src/util/virutil.h | 2 +- tests/meson.build | 1 + .../disk-cdrom-network.args.disk0 | 7 + .../disk-cdrom-network.args.disk1 | 9 + .../disk-cdrom-network.args.disk1.pipe.45 | 1 + .../disk-cdrom-network.args.disk2 | 9 + .../disk-cdrom-network.args.disk2.pipe.47 | 1 + .../disk-network-http.args.disk0 | 7 + .../disk-network-http.args.disk1 | 6 + .../disk-network-http.args.disk2 | 7 + .../disk-network-http.args.disk2.pipe.45 | 1 + .../disk-network-http.args.disk3 | 8 + .../disk-network-http.args.disk3.pipe.47 | 1 + ...work-source-curl-nbdkit-backing.args.disk0 | 8 + ...rce-curl-nbdkit-backing.args.disk0.pipe.45 | 1 + .../disk-network-source-curl.args.1.pipe.1 | 1 + .../disk-network-source-curl.args.disk0 | 8 + ...isk-network-source-curl.args.disk0.pipe.45 | 1 + .../disk-network-source-curl.args.disk1 | 10 + ...isk-network-source-curl.args.disk1.pipe.47 | 1 + ...isk-network-source-curl.args.disk1.pipe.49 | 1 + .../disk-network-source-curl.args.disk2 | 8 + ...isk-network-source-curl.args.disk2.pipe.49 | 1 + ...isk-network-source-curl.args.disk2.pipe.51 | 1 + .../disk-network-source-curl.args.disk3 | 7 + .../disk-network-source-curl.args.disk4 | 7 + .../disk-network-ssh.args.disk0 | 7 + tests/qemunbdkittest.c | 271 +++++ ...sk-cdrom-network-nbdkit.x86_64-latest.args | 42 + .../disk-cdrom-network-nbdkit.xml | 1 + ...isk-network-http-nbdkit.x86_64-latest.args | 45 + .../disk-network-http-nbdkit.xml | 1 + ...rce-curl-nbdkit-backing.x86_64-latest.args | 38 + ...isk-network-source-curl-nbdkit-backing.xml | 45 + ...work-source-curl-nbdkit.x86_64-latest.args | 50 + .../disk-network-source-curl-nbdkit.xml | 1 + ...isk-network-source-curl.x86_64-latest.args | 54 + .../disk-network-source-curl.xml | 74 ++ ...disk-network-ssh-nbdkit.x86_64-latest.args | 36 + .../disk-network-ssh-nbdkit.xml | 1 + .../disk-network-ssh.x86_64-latest.args | 36 + tests/qemuxml2argvdata/disk-network-ssh.xml | 31 + tests/qemuxml2argvtest.c | 18 + tests/testutilsqemu.c | 27 + tests/testutilsqemu.h | 5 + 65 files changed, 2474 insertions(+), 111 deletions(-) create mode 100644 src/qemu/qemu_nbdkit.c create mode 100644 src/qemu/qemu_nbdkit.h create mode 100644 src/qemu/qemu_nbdkitpriv.h create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.45 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.47 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.45 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.47 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.45 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.1.pipe.1 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.45 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.47 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.49 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.49 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.51 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk4 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk0 create mode 100644 tests/qemunbdkittest.c create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-http-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.xml -- 2.37.1

2 36

[PATCH 0/2] qemu: tpm: Improve TPM state files management
by Stefan Berger 04 Oct '22

04 Oct '22

This series of patches adds the --keep-tpm and --tpm flags to virsh for keeping and removing the TPM state directory structure when a VM is undefined. It also fixes the removal of state when a VM is migrated so that the state files are removed on the source upon successful migration and deleted on the destination after migration failure. Regards, Stefan Stefan Berger (2): qemu: Add UNDEFINE_TPM and UNDEFINE_KEEP_TPM flags qemu: tpm: Remove TPM state after successful migration include/libvirt/libvirt-domain.h | 6 ++++++ src/qemu/qemu_domain.c | 12 +++++++----- src/qemu/qemu_domain.h | 3 ++- src/qemu/qemu_driver.c | 31 ++++++++++++++++++++----------- src/qemu/qemu_extdevice.c | 5 +++-- src/qemu/qemu_extdevice.h | 3 ++- src/qemu/qemu_migration.c | 22 +++++++++++++++------- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_snapshot.c | 4 ++-- src/qemu/qemu_tpm.c | 14 ++++++++++---- src/qemu/qemu_tpm.h | 15 ++++++++++++++- tools/virsh-domain.c | 15 +++++++++++++++ 12 files changed, 98 insertions(+), 36 deletions(-) -- 2.37.1

2 11

[PATCH] virpcivpd: reduce errors in log due to invalid VPD
by christian.ehrhardt＠canonical.com 04 Oct '22

04 Oct '22

From: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Sadly some devices provide invalid VPD data even with fully updated firmware. Former hardning like 600f580d "PCI VPD: Skip fields with invalid values" have already helped for those to some extent. But if one happens to have such a device installed in the system, despite all other things working properly the log potentially flooded with messages like: internal error: The keyword is not comprised only of uppercase ASCII letters or digits internal error: A field data length violates the resource length boundary. The user can't do anything about it to change that, they will be there on any libvirt restart and potentially distract from other more important issues. Since the vpd decoding is implemented rather resilient (if parsing fails all goes on fine, the respective device just has no VPD data populated eventually) we can lower those from virReportError(VIR_ERR_INTERNAL_ERROR to just VIR_INFO. If needed for debugging people can set the level accordingly, but otherwise we would no more fill the logs with errors without a strong reason. Fixes: https://launchpad.net/bugs/1990949 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/util/virpcivpd.c | 47 +++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c index 4ba4fea237..39557c7347 100644 --- a/src/util/virpcivpd.c +++ b/src/util/virpcivpd.c @@ -62,12 +62,11 @@ virPCIVPDResourceGetKeywordPrefix(const char *keyword) /* Keywords must have a length of 2 bytes. */ if (strlen(keyword) != 2) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("The keyword length is not 2 bytes: %s"), keyword); + VIR_INFO("The keyword length is not 2 bytes: %s", keyword); return NULL; } else if (!(virPCIVPDResourceIsUpperOrNumber(keyword[0]) && virPCIVPDResourceIsUpperOrNumber(keyword[1]))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("The keyword is not comprised only of uppercase ASCII letters or digits")); + VIR_INFO("The keyword is not comprised only of uppercase ASCII letters or digits"); return NULL; } /* Special-case the system-specific keywords since they share the "Y" prefix with "YA". */ @@ -328,19 +327,16 @@ virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res, const bool readOnly, const char *const keyword, const char *const value) { if (!res) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot update the resource: a NULL resource pointer has been provided.")); + VIR_INFO("Cannot update the resource: a NULL resource pointer has been provided."); return false; } else if (!keyword) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot update the resource: a NULL keyword pointer has been provided.")); + VIR_INFO("Cannot update the resource: a NULL keyword pointer has been provided."); return false; } if (readOnly) { if (!res->ro) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot update the read-only keyword: RO section not initialized.")); + VIR_INFO("Cannot update the read-only keyword: RO section not initialized."); return false; } @@ -375,9 +371,7 @@ virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res, const bool readOnly, } else { if (!res->rw) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _ - ("Cannot update the read-write keyword: read-write section not initialized.")); + VIR_INFO("Cannot update the read-write keyword: read-write section not initialized."); return false; } @@ -476,8 +470,7 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t re if (virPCIVPDReadVPDBytes(vpdFileFd, buf, 3, fieldPos, csum) != 3) { /* Invalid field encountered which means the resource itself is invalid too. Report * That VPD has invalid format and bail. */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not read a resource field header - VPD has invalid format")); + VIR_INFO("Could not read a resource field header - VPD has invalid format"); return false; } fieldDataLen = buf[2]; @@ -488,12 +481,10 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t re /* Handle special cases first */ if (!readOnly && fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected RV keyword in the read-write section.")); + VIR_INFO("Unexpected RV keyword in the read-write section."); return false; } else if (readOnly && fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RDWR) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected RW keyword in the read-only section.")); + VIR_INFO("Unexpected RW keyword in the read-only section."); return false; } @@ -517,21 +508,18 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t re bytesToRead = fieldDataLen; break; default: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected field value format encountered.")); + VIR_INFO("Unexpected field value format encountered."); return false; } if (resPos + resDataLen < fieldPos + fieldDataLen) { /* In this case the field cannot simply be skipped since the position of the * next field is determined based on the length of a previous field. */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("A field data length violates the resource length boundary.")); + VIR_INFO("A field data length violates the resource length boundary."); return false; } if (virPCIVPDReadVPDBytes(vpdFileFd, buf, bytesToRead, fieldPos, csum) != bytesToRead) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not parse a resource field data - VPD has invalid format")); + VIR_INFO("Could not parse a resource field data - VPD has invalid format"); return false; } /* Advance the position to the first byte of the next field. */ @@ -552,7 +540,7 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t re } else if (fieldFormat == VIR_PCI_VPD_RESOURCE_FIELD_VALUE_FORMAT_RESVD) { if (*csum) { /* All bytes up to and including the checksum byte should add up to 0. */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Checksum validation has failed")); + VIR_INFO("Checksum validation has failed"); return false; } hasChecksum = true; @@ -578,8 +566,7 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t re } /* The field format, keyword and value are determined. Attempt to update the resource. */ if (!virPCIVPDResourceUpdateKeyword(res, readOnly, fieldKeyword, fieldValue)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not update the VPD resource keyword: %s"), fieldKeyword); + VIR_INFO("Could not update the VPD resource keyword: %s", fieldKeyword); return false; } } @@ -627,14 +614,12 @@ virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos, g_autofree char *buf = g_malloc0(resDataLen + 1); if (virPCIVPDReadVPDBytes(vpdFileFd, (uint8_t *)buf, resDataLen, resPos, csum) != resDataLen) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not read a part of a resource - VPD has invalid format")); + VIR_INFO("Could not read a part of a resource - VPD has invalid format"); return false; } resValue = g_strdup(g_strstrip(buf)); if (!virPCIVPDResourceIsValidTextValue(resValue)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("The string resource has invalid characters in its value")); + VIR_INFO("The string resource has invalid characters in its value"); return false; } res->name = g_steal_pointer(&resValue); -- 2.37.3

3 3

[PATCH] virt-aa-helper: allow common riscv64 loader paths
by christian.ehrhardt＠canonical.com 04 Oct '22

04 Oct '22

From: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Riscv64 usually uses u-boot as external -kernel and a loader from the open implementation of RISC-V SBI. The paths for those binaries as packaged in Debian and Ubuntu are in paths which are usually forbidden to be added by the user under /usr/lib... People used to start riscv64 guests only manually via qemu cmdline, but trying to encapsulate that via libvirt now causes failures when starting the guest due to the apparmor isolation not allowing that: virt-aa-helper: error: skipped restricted file virt-aa-helper: error: invalid VM definition Explicitly allow the sub-paths used by u-boot-qemu and opensbi under /usr/lib/ as readonly rules. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index f338488da3..ceadaef99b 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -476,11 +476,13 @@ valid_path(const char *path, const bool readonly) "/initrd", "/initrd.img", "/usr/share/edk2/", - "/usr/share/OVMF/", /* for OVMF images */ - "/usr/share/ovmf/", /* for OVMF images */ - "/usr/share/AAVMF/", /* for AAVMF images */ - "/usr/share/qemu-efi/", /* for AAVMF images */ - "/usr/share/qemu-efi-aarch64/" /* for AAVMF images */ + "/usr/share/OVMF/", /* for OVMF images */ + "/usr/share/ovmf/", /* for OVMF images */ + "/usr/share/AAVMF/", /* for AAVMF images */ + "/usr/share/qemu-efi/", /* for AAVMF images */ + "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */ + "/usr/lib/u-boot/", /* u-boot loaders for qemu */ + "/usr/lib/riscv64-linux-gnu/opensbi" /* RISC-V SBI implementation */ }; /* override the above with these */ const char * const override[] = { -- 2.37.3

4 5

[PATCH v3] rpc: fix memory leak in virNetServerClientNew and virNetServerProgramDispatchCall
by Jiang Jiacheng 03 Oct '22

03 Oct '22

From: jiangjiacheng <jiangjiacheng(a)huawei.com> In virNetServerProgramDispatchCall, The arg is passed as a void* and used to point to a certain struct depended on the dispatcher, so I think it's the memory of the struct's member that leaks and this memory shuld be freed by xdr_free. In virNetServerClientNew, client->rx is assigned by invoking virNetServerClientNew, but isn't freed if client->privateData's initialization failed, which leads to a memory leak. Thanks to Liang Peng's suggestion, put virNetMessageFree(client->rx) into virNetServerClientDispose() to release the memory. diff to v2: - virNetServerProgramDispatchCall, only free the memory in successful path and error label. Signed-off-by: jiangjiacheng <jiangjiacheng(a)huawei.com> --- src/rpc/virnetserverclient.c | 2 ++ src/rpc/virnetserverprogram.c | 22 ++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index a7d2dfa795..30f6af7be5 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -931,6 +931,8 @@ void virNetServerClientDispose(void *obj) PROBE(RPC_SERVER_CLIENT_DISPOSE, "client=%p", client); + if (client->rx) + virNetMessageFree(client->rx); if (client->privateData) client->privateDataFreeFunc(client->privateData); diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 3ddf9f0428..94660f867a 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -368,7 +368,7 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, g_autofree char *arg = NULL; g_autofree char *ret = NULL; int rv = -1; - virNetServerProgramProc *dispatcher; + virNetServerProgramProc *dispatcher = NULL; virNetMessageError rerr; size_t i; g_autoptr(virIdentity) identity = NULL; @@ -446,8 +446,6 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, msg->nfds = 0; } - xdr_free(dispatcher->arg_filter, arg); - if (rv < 0) goto error; @@ -460,28 +458,28 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, /*msg->header.serial = msg->header.serial;*/ msg->header.status = VIR_NET_OK; - if (virNetMessageEncodeHeader(msg) < 0) { - xdr_free(dispatcher->ret_filter, ret); + if (virNetMessageEncodeHeader(msg) < 0) goto error; - } if (msg->nfds && - virNetMessageEncodeNumFDs(msg) < 0) { - xdr_free(dispatcher->ret_filter, ret); + virNetMessageEncodeNumFDs(msg) < 0) goto error; - } - if (virNetMessageEncodePayload(msg, dispatcher->ret_filter, ret) < 0) { - xdr_free(dispatcher->ret_filter, ret); + if (virNetMessageEncodePayload(msg, dispatcher->ret_filter, ret) < 0) goto error; - } + xdr_free(dispatcher->arg_filter, arg); xdr_free(dispatcher->ret_filter, ret); /* Put reply on end of tx queue to send out */ return virNetServerClientSendMessage(client, msg); error: + if (dispatcher) { + xdr_free(dispatcher->arg_filter, arg); + xdr_free(dispatcher->ret_filter, ret); + } + /* Bad stuff (de-)serializing message, but we have an * RPC error message we can send back to the client */ rv = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); -- 2.33.0

2 1