- Devel - libvirt List Archives

[libvirt PATCH] ci: integration: Update the perl CI job names
by Erik Skultety 06 Oct '22

06 Oct '22

libvirt-derived repos recently changed the way how and when CI containers are built and for that a different naming scheme was adopted to differentiate between the 2. Update the integration pipeline config to reflect this change. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/integration.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/integration.yml b/ci/integration.yml index 43f22813c9..0a349bc9b3 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -6,7 +6,7 @@ centos-stream-8-tests: needs: - x86_64-centos-stream-8 - project: libvirt/libvirt-perl - job: x86_64-centos-stream-8 + job: x86_64-centos-stream-8-prebuilt-env ref: master artifacts: true variables: @@ -22,7 +22,7 @@ centos-stream-9-tests: needs: - x86_64-centos-stream-9 - project: libvirt/libvirt-perl - job: x86_64-centos-stream-9 + job: x86_64-centos-stream-9-prebuilt-env ref: master artifacts: true variables: @@ -38,7 +38,7 @@ fedora-35-tests: needs: - x86_64-fedora-35 - project: libvirt/libvirt-perl - job: x86_64-fedora-35 + job: x86_64-fedora-35-prebuilt-env ref: master artifacts: true variables: @@ -54,7 +54,7 @@ fedora-36-tests: needs: - x86_64-fedora-36 - project: libvirt/libvirt-perl - job: x86_64-fedora-36 + job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true variables: @@ -70,7 +70,7 @@ fedora-36-upstream-qemu-tests: needs: - x86_64-fedora-36 - project: libvirt/libvirt-perl - job: x86_64-fedora-36 + job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true variables: -- 2.37.3

2 1

[libvirt PATCH 00/11] Improve CPU model reporting in domain capabilities
by Jiri Denemark 05 Oct '22

05 Oct '22

See patches 04/11 and 10/11 for details. Patches 4, 6, and 10 were truncated as they include a lot of boring changes in tests, complete patches are available in my gitlab repo: git fetch git@gitlab.com:jirkade/libvirt.git domaincaps Jiri Denemark (11): conf: virDomainCapsCPUModelsAdd never fails cpu_ppc64: Avoid repeated loading of CPU map qemu: Do not pass qemuCaps to virQEMUCapsCPUFeature{To,From}QEMU domain_capabilities: Add vendor attribute for CPU models Introduce virCPUGetVendorForModel and use it in QEMU driver cpu_x86: Implement virCPUGetVendorForModel cpu_ppc64: Implement virCPUGetVendorForModel cpu_arm: Don't implement virCPUGetVendorForModel qemu_capabilities: Translate CPU blockers domain_capabilities: Add blockers attribute for CPU models NEWS: Document domain capabilities improvements NEWS.rst | 11 ++ docs/formatdomaincaps.rst | 20 ++- src/conf/domain_capabilities.c | 42 +++-- src/conf/domain_capabilities.h | 13 +- src/conf/schemas/domaincaps.rng | 8 + src/cpu/cpu.c | 25 +++ src/cpu/cpu.h | 8 + src/cpu/cpu_arm.c | 1 + src/cpu/cpu_ppc64.c | 67 ++++++-- src/cpu/cpu_x86.c | 19 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 65 +++++--- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 7 +- src/qemu/qemu_monitor.h | 5 +- src/qemu/qemu_monitor_json.c | 11 +- src/qemu/qemu_monitor_json.h | 1 - src/qemu/qemu_process.c | 12 +- tests/cputest.c | 15 +- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 104 ++++++------ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 104 ++++++------ .../qemu_4.2.0-virt.aarch64.xml | 72 ++++----- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 72 ++++----- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 148 +++++++++--------- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 104 ++++++------ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 108 ++++++------- .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 108 ++++++------- .../qemu_5.0.0-virt.aarch64.xml | 74 ++++----- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 74 ++++----- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 8 +- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 108 ++++++------- .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 108 ++++++------- .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 108 ++++++------- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 108 ++++++------- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 108 ++++++------- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 108 ++++++------- .../qemu_5.2.0-virt.aarch64.xml | 74 ++++----- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 74 ++++----- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 8 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 148 +++++++++--------- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 108 ++++++------- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 110 ++++++------- .../qemu_6.0.0-virt.aarch64.xml | 76 ++++----- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 76 ++++----- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 148 +++++++++--------- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 110 ++++++------- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 110 ++++++------- .../qemu_6.2.0-virt.aarch64.xml | 78 ++++----- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 78 ++++----- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 8 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 110 ++++++------- .../qemu_7.0.0-virt.aarch64.xml | 78 ++++----- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 78 ++++----- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 8 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 110 ++++++------- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 106 ++++++------- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 106 ++++++------- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 106 ++++++------- 67 files changed, 2389 insertions(+), 2256 deletions(-) -- 2.37.3

3 20

[PATCH v2 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 v2: - addressed Michal's comments on v1 Stefan Berger (2): qemu: Add UNDEFINE_TPM and UNDEFINE_KEEP_TPM flags qemu: tpm: Remove TPM state after successful migration docs/manpages/virsh.rst | 6 ++++++ include/libvirt/libvirt-domain.h | 4 ++++ 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 | 13 +++++++------ src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_snapshot.c | 4 ++-- src/qemu/qemu_tpm.c | 18 ++++++++++++++---- src/qemu/qemu_tpm.h | 3 ++- tools/virsh-domain.c | 15 +++++++++++++++ 13 files changed, 86 insertions(+), 35 deletions(-) -- 2.37.3

2 7

[PATCH 00/43] XML parsing helper cleanup
by Peter Krempa 04 Oct '22

04 Oct '22

This series cleans up the use of virXMLParse* macros and tries to unify and remove the uncommon ones. In next step since virXMLParse itself has features which can replace open-coded bits in conf parsers for all various object types we have, this series cleans them up too. Peter Krempa (43): util: xml: Expose all arguments of virXMLParseHelper in virXMLParse macro conf: nwfilderbindigobj: Register automatic cleanup for virNWFilterBindingObj virNWFilterBindingObjParse: Refactor XML parsing code vbox: snapshot_conf: Don't allocate XPath context explicitly virVBoxSnapshotConfGet(RW|RO)DisksPathsFromLibvirtXML: Refactor virNWFilterBindingDefParse: Properly use virXMLParse conf: nwfilterbinding: Provide only virNWFilterBindingDefParse tests: qemuxml2argv: Use virXMLParse properly conf: networkport: Remove virNetworkPortDefParseNode conf: networkportdef: Provide only virNetworkPortDefParse testParseXMLDocFromFile: Refactor control flow testParseXMLDocFromFile: Remove 'type' argument testParseXMLDocFromFile: Validate that the replaced node is identical with parsed root conf: storage: Remove virStoragePoolDefParseNode conf: storage: Provide only virStoragePoolDefParse conf: storage: Remove virStorageVolDefParseNode conf: storage: Provide only virStorageVolDefParse conf: snapshot: Remove virDomainSnapshotDefParseNode conf: secret: Refactor secretXMLParseNode conf: secret: Provide only virSecretDefParse prlsdkParseSnapshotTree: Simplify XML parsing code conf: checkpoint: Remove virDomainCheckpointDefParseNode conf: backup: Remove virDomainBackupDefParseNode conf: nwfilter: Remove virNWFilterDefParseNode conf: nwfilter: Provide only virNWFilterDefParse conf: node_device: Remove virNodeDeviceDefParseNode conf: nodedev: Provide only virNodeDeviceDefParse conf: interface: Remove virInterfaceDefParseNode conf: interface: Remove virInterfaceDefParseFile conf: network: Remove virNetworkDefParseNode conf: network: Provide only virNetworkDefParse conf: domain: Remove virDomainObjParseNode conf: domain: Simplify validation in virDomainDefParse virDomainDefParseNode: Pass only the XPath context as argument virsh: Use proper helper for parsing XML in virshDumpXML util: xml: Remove virXMLParseString qemu: capabilities: Convert virQEMUCapsLoadCache to virXMLParse util: xml: Remove virXMLParseFile util: xml: Remove virXMLParseCtxt conf: savecookie: Remove virSaveCookieParseNode security: aa-helper: Use virXMLParse instead of virXMLParseString test_driver: Make callers of testOpenParse ensure the root element name util: xml: Remove virXMLParseStringCtxtRoot src/conf/backup_conf.c | 42 ++------ src/conf/backup_conf.h | 10 +- src/conf/checkpoint_conf.c | 42 +++----- src/conf/domain_conf.c | 85 +++++----------- src/conf/domain_conf.h | 7 +- src/conf/interface_conf.c | 54 ++-------- src/conf/interface_conf.h | 7 +- src/conf/network_conf.c | 50 ++-------- src/conf/network_conf.h | 16 +-- src/conf/node_device_conf.c | 57 ++--------- src/conf/node_device_conf.h | 25 ++--- src/conf/nwfilter_conf.c | 48 ++------- src/conf/nwfilter_conf.h | 12 +-- src/conf/secret_conf.c | 44 ++------ src/conf/secret_conf.h | 7 +- src/conf/snapshot_conf.c | 57 ++++------- src/conf/snapshot_conf.h | 13 +-- src/conf/storage_conf.c | 108 +++----------------- src/conf/storage_conf.h | 31 ++---- src/conf/virnetworkobj.c | 6 +- src/conf/virnetworkportdef.c | 49 ++------- src/conf/virnetworkportdef.h | 12 +-- src/conf/virnwfilterbindingdef.c | 51 ++-------- src/conf/virnwfilterbindingdef.h | 11 +- src/conf/virnwfilterbindingobj.c | 66 +++--------- src/conf/virnwfilterbindingobj.h | 3 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virnwfilterobj.c | 2 +- src/conf/virsavecookie.c | 31 ++---- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 4 +- src/hypervisor/domain_driver.c | 7 +- src/libvirt_private.syms | 41 +++----- src/network/bridge_driver.c | 10 +- src/node_device/node_device_driver.c | 8 +- src/nwfilter/nwfilter_driver.c | 4 +- src/qemu/qemu_capabilities.c | 15 +-- src/qemu/qemu_domain.c | 9 +- src/qemu/qemu_migration_cookie.c | 10 +- src/qemu/qemu_process.c | 2 +- src/secret/secret_driver.c | 2 +- src/security/virt-aa-helper.c | 9 +- src/storage/storage_driver.c | 10 +- src/test/test_driver.c | 138 +++++++++++--------------- src/util/virxml.h | 50 ++-------- src/vbox/vbox_network.c | 2 +- src/vbox/vbox_snapshot_conf.c | 129 +++++++----------------- src/vbox/vbox_storage.c | 2 +- src/vz/vz_sdk.c | 18 +--- tests/networkxml2conftest.c | 2 +- tests/networkxml2firewalltest.c | 2 +- tests/networkxml2xmltest.c | 2 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nodedevmdevctltest.c | 8 +- tests/nodedevxml2xmltest.c | 3 +- tests/nwfilterxml2firewalltest.c | 2 +- tests/nwfilterxml2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 19 +--- tests/secretxml2xmltest.c | 2 +- tests/storagepoolxml2argvtest.c | 2 +- tests/storagepoolxml2xmltest.c | 2 +- tests/storagevolxml2argvtest.c | 8 +- tests/storagevolxml2xmltest.c | 4 +- tests/virnetworkportxml2xmltest.c | 2 +- tests/virnwfilterbindingxml2xmltest.c | 2 +- tests/virschematest.c | 2 +- tools/virsh-util.c | 5 +- 69 files changed, 399 insertions(+), 1098 deletions(-) -- 2.37.3

2 45

[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