- Devel - libvirt List Archives

[PATCH 0/9] audio: remove deprecated QEMU_AUDIO env support
by Daniel P. Berrangé 16 Jan '23

16 Jan '23

This removes much of the deprecated audio code, most notably the QEMU_AUDIO env variables. The VNC server will also stop accepting client requests for audio streaming unless an audiodev is set. I tried to make the use of 'audiodev' mandatory for devices but that turned out to not be practical. Our test suite assumes it can create any device type without setting any properties. This is not possible if 'audiodev' setting is enforced at realize() time. Also there are several machihe boards with embedded soundcards that provide no way to set audiodev AFAICT Daniel P. Berrangé (9): audio: don't check qemu_add_vm_change_state_handler failure audio: remove special audio_calloc function audio: remove unused 'name' in QEMUSoundCard struct audio: remove QEMUSoundCard linked list audio: remove empty AUD_remove_card method docs: split the deprecation warning for soundcards vs VNC ui/vnc: don't accept VNC_ENCODING_AUDIO without audiodev audio: audio state is now mandatory for capture audio: remove support for QEMU_AUDIO_ env variables audio/alsaaudio.c | 6 +- audio/audio.c | 71 +--- audio/audio.h | 4 - audio/audio_int.h | 2 - audio/audio_legacy.c | 552 -------------------------------- audio/audio_template.h | 28 +- audio/meson.build | 1 - audio/mixeng.c | 7 +- docs/about/deprecated.rst | 16 +- docs/about/removed-features.rst | 14 + hw/audio/ac97.c | 1 - hw/audio/adlib.c | 1 - hw/audio/es1370.c | 1 - hw/audio/gus.c | 1 - hw/audio/hda-codec.c | 1 - hw/audio/wm8750.c | 1 - hw/usb/dev-audio.c | 1 - softmmu/vl.c | 4 - tests/qtest/fuzz-sb16-test.c | 6 +- tests/qtest/libqtest.c | 3 - ui/vnc.c | 10 +- 21 files changed, 53 insertions(+), 678 deletions(-) delete mode 100644 audio/audio_legacy.c -- 2.38.1

2 12

[PATCH] NEWS: Document my contributions for upcoming release
by Michal Privoznik 16 Jan '23

16 Jan '23

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 9baf10b8e9..a860c2b6f6 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -50,6 +50,30 @@ v9.0.0 (unreleased) With sufficiently new QEMU (v7.1.0) screenshots change format from PPM to PNG. + * tools: Fix install_mode for some scripts + + Scripts from the following list were installed with group write bit set: + virt-xml-validate, virt-pki-validate, virt-sanlock-cleanup, + libvirt-guests.sh. This was changed so that only the owner is able to write + them. + + * qemu: Allow multiple nodes for preferred policy + + Due to restrictions of old kernels and libnuma APIs, the preferred NUMA + policy accepted just a single host NUMA node. With recent enough kernel + (v5.15.0) and libnuma (v2.0.15) it's possible to set multiple nodes. + + * secret: Inhibit shutdown of daemon for ephemeral secrets + + When an ephemeral secret is defined then automatic shutdown of virtsecretd + is inhibited. This is to avoid ephemeral secrets disappearing shortly + before their use. + + * qemu: Report Hyper-V Enlightenments in domcapabilities + + The supported Hyper-V Enlightenments are now reported in domain + capabilities XML. + * **Bug fixes** * Fix NULL-pointer dereference `virXMLPropStringRequired` @@ -58,6 +82,19 @@ v9.0.0 (unreleased) by using `virXMLPropStringRequired` the parser will crash instead of reporting an error. + * qemu: Init ext devices paths on reconnect + + Paths for external devices are not stored in the status XML. Therefore, + when the daemon restarted and was reconnecting to a running domain, these + paths were left blank which led to the daemon crash. + + * qemu: Validate arguments passed to `virConnectGetDomainCapabilities` + + There was a code path in which insufficient validation of input arguments + of `virConnectGetDomainCapabilities` API was possible which led to the + daemon crash. This path is now fixed. + + v8.10.0 (2022-12-01) ==================== -- 2.38.2

2 1

[PATCH V8 00/13] spec: Decompose the daemon subpackage
by Jim Fehlig 13 Jan '23

13 Jan '23

This is V8 of https://listman.redhat.com/archives/libvir-list/2023-January/236919.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V7: * Since the primary and secondary drivers need to be handled a bit differently when dropping the libvirt-daemon dependency, split the work into two patches Jim Fehlig (13): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from secondary drivers spec: Remove libvirt-daemon dependency from primary drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages NEWS: Mention split of libvirt-daemon subpackage NEWS.rst | 6 + docs/kbase/rpm-deployment.rst | 48 +++-- libvirt.spec.in | 333 ++++++++++++++++++++++++---------- src/libxl/virtxend.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- 5 files changed, 281 insertions(+), 110 deletions(-) -- 2.38.1

2 19

Entering freeze for libvirt-9.0.0
by Jiri Denemark 13 Jan '23

13 Jan '23

I have just tagged v9.0.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

3 5

[PATCH] NEWS: Document virDomainFDAssociate and NULL dereference in virXMLPropStringRequired
by Peter Krempa 13 Jan '23

13 Jan '23

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 8482c49b3c..9baf10b8e9 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -38,6 +38,12 @@ v9.0.0 (unreleased) Connecting the VM to a swtpm daemon started outside of libvirt is now possible. + * QEMU: Support for passing FDs instead of opening files for `<disk>` + + A new API `virDomainFDAssociate` gives the users the option to pass FDs + to libvirt and then use them when starting a VM. Currently the FDs can + be used instead of directly opening files as `<disk>` backend. + * **Improvements** * qemu: Prefer PNG for domain screenshots @@ -46,6 +52,11 @@ v9.0.0 (unreleased) * **Bug fixes** + * Fix NULL-pointer dereference `virXMLPropStringRequired` + + Fix a bug where when parsing a XML property which is required to be present + by using `virXMLPropStringRequired` the parser will crash instead of + reporting an error. v8.10.0 (2022-12-01) ==================== -- 2.38.1

2 1

[libvirt PATCH 0/3] Remove <backend upstream='blah'/> per danpb's request, and a couple small cleanups
by Laine Stump 13 Jan '23

13 Jan '23

The first patch implements what danpb suggested yesterday - using <source dev='blah'/> instead of <backend upstream='blah'/> to populate the passt --interface option. The other two are small cleanups I noticed while making the changes in patch 1. jdenemar: feel free to push once they've been reviewed, rather than waiting for me to get up, so that you can get RC2 tagged. Laine Stump (3): conf: remove <backend upstream='xxx'/> attribute qemu: remove commented-out option in passt qemu commandline setup tests: remove unused qemu .args file docs/formatdomain.rst | 9 +++--- src/conf/domain_conf.c | 15 ++++++++-- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 13 +++++---- src/qemu/qemu_passt.c | 5 ++-- tests/qemuxml2argvdata/net-user-passt.args | 34 ---------------------- tests/qemuxml2argvdata/net-user-passt.xml | 3 +- 7 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 tests/qemuxml2argvdata/net-user-passt.args -- 2.38.1

2 5

[libvirt PATCH 0/9] Support libvirt-managed QEMU domain <interface> backed by a passt process
by Laine Stump 12 Jan '23

12 Jan '23

passt (https://passt.top) provides a method for connecting a guest to the larger network without requiring any elevated privileges. This set of patches allows libvirt/QEMU users to easily configure a QEMU domain to use passt for the backend of any emulated network interface. More details are in the individual patches, but the short explanation is that you will use: <interface type='user'> <backend type='passt'> ... to select the passt backend. (We decided to do it this way since the concept is so similar to slirp, which was the original "type='user'") The following caveats currently apply: 1) passt support requires "-netdev stream" in QEMU, which is only available starting with qemu-7.2.0. So if you want to test these patches out, you need the latest upstream release of QEMU. 2) SELinux must be set to "permissive". This is of course temporary. As I understand it, the remedy to this is a new SELinux profile for the passt binary, which is outside the control of libvirt and so not something that can be addressed in this patchset (or any other patch to libvirt). 3) Although there is a a new option for QEMU's -netdev that will tell QEMU to attempt to reconnect to a new incarnation of the same socket if passt unexpectedly exits, and a new QEMU event that will be put into QEMU to inform libvirt that the passt process has exited (so that it can start a new, identical passt process), I think this hasn't been pushed upstream yet (??), and I haven't implemented any support for it here. So, if the passt process unexpectedly exits, the guest will be without networking. However, Stefano (passt author) is emphatic that passt will never unexpectedly exit :-) passt has *many* other options that libvirt could support, but the small subset here are the things that seem most useful (and/or were specifically requested by prospective users of passt). It is always easier to add more stuff in the future than to remove "mistakes", so I tried to no go overboard. Laine Stump (9): conf: rename virDomainNetBackend* to virDomainNetDriver* conf: move anonymous backend struct from virDomainNetDef into its own struct conf: put interface <backend> parsing/formatting separate functions conf: add passt XML additions to schema conf: parse/format passt-related XML additions qemu: new capability QEMU_CAPS_NETDEV_STREAM qemu: add passtStateDir to qemu driver config qemu: hook up passt config to qemu domains specfile: require passt for the build if fedora >= 36 or rhel >= 9 docs/formatdomain.rst | 95 +++++- libvirt.spec.in | 7 + meson.build | 1 + po/POTFILES | 1 + src/conf/domain_conf.c | 303 ++++++++++++++++-- src/conf/domain_conf.h | 64 +++- src/conf/domain_validate.c | 32 +- src/conf/schemas/domaincommon.rng | 65 ++++ src/conf/virconftypes.h | 6 + src/libvirt_private.syms | 1 + src/qemu/meson.build | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 11 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 12 + src/qemu/qemu_extdevice.c | 25 +- src/qemu/qemu_hotplug.c | 26 +- src/qemu/qemu_interface.c | 8 +- src/qemu/qemu_passt.c | 284 ++++++++++++++++ src/qemu/qemu_passt.h | 38 +++ src/qemu/qemu_process.c | 1 + src/qemu/qemu_validate.c | 9 +- src/security/virt-aa-helper.c | 2 +- .../caps_7.2.0.x86_64.xml | 1 + tests/qemuxml2argvdata/net-user-passt.args | 34 ++ .../net-user-passt.x86_64-latest.args | 37 +++ tests/qemuxml2argvdata/net-user-passt.xml | 57 ++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmloutdata/net-user-passt.xml | 1 + tests/qemuxml2xmltest.c | 1 + 35 files changed, 1087 insertions(+), 60 deletions(-) create mode 100644 src/qemu/qemu_passt.c create mode 100644 src/qemu/qemu_passt.h create mode 100644 tests/qemuxml2argvdata/net-user-passt.args create mode 100644 tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-user-passt.xml create mode 120000 tests/qemuxml2xmloutdata/net-user-passt.xml -- 2.38.1

5 27

[PATCH V7 00/12] spec: Decompose the daemon subpackage
by Jim Fehlig 12 Jan '23

12 Jan '23

This is V7 of https://listman.redhat.com/archives/libvir-list/2023-January/236586.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V6: * Revert to including virtlockd and lockd plugin in the hypervisor subpackages * Add NEWS entry Jim Fehlig (12): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages NEWS: Mention split of libvirt-daemon subpackage NEWS.rst | 6 + docs/kbase/rpm-deployment.rst | 48 +++-- libvirt.spec.in | 331 ++++++++++++++++++++++++---------- 3 files changed, 277 insertions(+), 108 deletions(-) -- 2.38.1

3 20

[PATCH] docs: drvqemu: Fix a typo
by Han Han 12 Jan '23

12 Jan '23

Fixes: a677ea92 Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/drvqemu.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index fa23912937..22d7e6502b 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -295,7 +295,7 @@ to ``system_u:object_r:virt_image_t``. In the case of NFS, there is an alternative option, of enabling the ``virt_use_nfs`` SELinux boolean. There are some network filesystems, however, that propagate SELinux labels -properly, just like a local filesystem (e.g. ceph of CIFS). In such case, +properly, just like a local filesystem (e.g. ceph or CIFS). In such case, dynamic labelling (described below) might prevent migration of a virtual machine as new unique SELinux label is assigned to the virtual machine on the migration destination side. Users are advised to use static labels (``<seclabel -- 2.39.0

2 1

[PATCH v1] qemu: block: fix error when blockcopy target is librbd encrypted
by Or Ozeri 12 Jan '23

12 Jan '23

Encryption secrets are considered a format dependency, even when being used by the storage node itself, as in the case of using encryption engine=librbd. Currently, the storage node is created (blockdev-add) before creating the format dependencies (including encryption secrets). As a result, when trying to perform a blockcopy when the target disk uses librbd encryption, an error of this form is returned: "error: internal error: unable to execute QEMU command 'blockdev-add': No secret with id 'libvirt-5-format-encryption-secret0'" To overcome this error, we change the order of commands so that format dependencies are created BEFORE creating the storage node. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e865aa17f9..2aafb2fac7 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1490,9 +1490,9 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon, qemuBlockStorageSourceAttachData *data) { if (qemuBlockStorageSourceAttachApplyStorageDeps(mon, data) < 0 || + qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 || qemuBlockStorageSourceAttachApplyStorage(mon, data) < 0 || qemuBlockStorageSourceAttachApplyStorageSlice(mon, data) < 0 || - qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 || qemuBlockStorageSourceAttachApplyFormat(mon, data) < 0) return -1; -- 2.25.1

1 0

[libvirt PATCH] ci: integration: Set an expiration on logs artifacts
by Erik Skultety 12 Jan '23

12 Jan '23

The default expiry time is 30 days. Since the RPM artifacts coming from the previous pipeline stages are set to expire in 1 day we can set the failed integration job log artifacts to the same value. The sentiment here is that if an integration job legitimately failed (i.e. not with an infrastructure failure) unless it was fixed in the meantime it will fail the next day with the scheduled pipeline again, meaning, that even if the older log artifacts are removed, they'll be immediately replaced with fresh ones. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- If you look at: - https://gitlab.com/libvirt/libvirt/-/jobs/3563902921 - https://gitlab.com/libvirt/libvirt/-/jobs/3557946738 you can clearly see that the artifacts are still taking up (although small) some GitLab storage space which is unnecessary since anyone interested in debugging would opt into getting the latest ones anyway. ci/integration-template.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 61cd034009..9141d5cedf 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -94,6 +94,7 @@ SCRATCH_DIR: "/tmp/scratch" artifacts: name: logs + expire_in: 1 day paths: - logs when: on_failure -- 2.39.0

2 1

[libvirt PATCH] NEWS: document external swtpm backend addition
by Ján Tomko 11 Jan '23

11 Jan '23

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 768208ed03..8482c49b3c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -33,6 +33,11 @@ v9.0.0 (unreleased) <backend type='passt'> ... + * QEMU: add external backend for swtpm + + Connecting the VM to a swtpm daemon started outside of libvirt + is now possible. + * **Improvements** * qemu: Prefer PNG for domain screenshots -- 2.39.0

2 1

[libvirt PATCH 0/2] Coverity inspired fixes for qemuPasstStart
by Jiri Denemark 11 Jan '23

11 Jan '23

Jiri Denemark (2): qemu: Don't check pidfile in qemuPasstStart qemu: Change some gotos in qemuPasstStart to direct return src/qemu/qemu_passt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.39.0

2 3

[libvirt PATCH] conf: Avoid NULL dereference in virDomainNetPortForwardFree
by Jiri Denemark 11 Jan '23

11 Jan '23

In our current code the function is not called with NULL argument, but we should follow our common practice and make it safe anyway. Reported by coverity: /src/conf/domain_conf.c: 2635 in virDomainNetPortForwardFree() 2629 { 2630 size_t i; 2631 2632 if (pf) 2633 g_free(pf->dev); 2634 >>> CID 404359: Null pointer dereferences (FORWARD_NULL) >>> Dereferencing null pointer "pf". 2635 for (i = 0; i < pf->nRanges; i++) 2636 g_free(pf->ranges[i]); 2637 2638 g_free(pf->ranges); 2639 g_free(pf); 2640 } Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 598e23b005..e43dee1a60 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2629,8 +2629,10 @@ virDomainNetPortForwardFree(virDomainNetPortForward *pf) { size_t i; - if (pf) - g_free(pf->dev); + if (!pf) + return; + + g_free(pf->dev); for (i = 0; i < pf->nRanges; i++) g_free(pf->ranges[i]); -- 2.39.0

2 1

[PATCH v2] qemu: add append mode config for serial file
by Oleg Vasilev 11 Jan '23

11 Jan '23

Serial log file contains lots of useful information for debugging configuration problems. It makes sense to preserve the log in between restarts, so that one can later figure out what was going on. Before that, we could do that on a per-domain basis, now we can configure it once for all domains. Signed-off-by: Oleg Vasilev <oleg.vasilev(a)virtuozzo.com> --- src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf.in | 9 ++++ src/qemu/qemu_conf.c | 4 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 13 +++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemuxml2argvdata/serial-append.xml | 53 +++++++++++++++++++ .../qemuxml2xmloutdata/serial-append.off.xml | 53 +++++++++++++++++++ tests/qemuxml2xmloutdata/serial-append.on.xml | 53 +++++++++++++++++++ tests/qemuxml2xmloutdata/serial-append.xml | 53 +++++++++++++++++++ tests/qemuxml2xmltest.c | 10 ++++ 11 files changed, 254 insertions(+) create mode 100644 tests/qemuxml2argvdata/serial-append.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.off.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.on.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ed097ea3d9..7f3eec7cfd 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -147,6 +147,8 @@ module Libvirtd_qemu = let capability_filters_entry = str_array_entry "capability_filters" + let serial_file_append_entry = str_entry "serial_file_append" + (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -171,6 +173,7 @@ module Libvirtd_qemu = | swtpm_entry | capability_filters_entry | obsolete_entry + | serial_file_append_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 3895d42514..9c9a535e8d 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -968,3 +968,12 @@ # "full" - both QEMU and its helper processes are placed into separate # scheduling group #sched_core = "none" + +# Default append mode for writing to serial file. QEMU will set the chosen +# value everytime it processes the config, unless some value is already there. +# +# Possible options are: +# "default" - leave as-is for QEMU to decide. +# "on" - set append value to "on", meaning file won't be truncated on restart +# "off" - set append value to "off", file will be cleared on restart +#serial_file_append = "default" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ae5bbcd138..bfd93a168f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -288,6 +288,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, return NULL; cfg->deprecationBehavior = g_strdup("none"); + cfg->serialFileAppend = g_strdup("default"); return g_steal_pointer(&cfg); } @@ -376,6 +377,7 @@ static void virQEMUDriverConfigDispose(void *obj) g_strfreev(cfg->capabilityfilters); g_free(cfg->deprecationBehavior); + g_free(cfg->serialFileAppend); } @@ -903,6 +905,8 @@ virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfig *cfg, return -1; if (virConfGetValueString(conf, "deprecation_behavior", &cfg->deprecationBehavior) < 0) return -1; + if (virConfGetValueString(conf, "serial_file_append", &cfg->serialFileAppend) < 0) + return -1; return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 8cf2dd2ec5..316200f38d 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -229,6 +229,8 @@ struct _virQEMUDriverConfig { char *deprecationBehavior; virQEMUSchedCore schedCore; + + char *serialFileAppend; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ae458ae45..0d1fe1ffcc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -37,6 +37,7 @@ #include "qemu_validate.h" #include "qemu_namespace.h" #include "viralloc.h" +#include "virenum.h" #include "virlog.h" #include "virerror.h" #include "viridentity.h" @@ -5357,6 +5358,8 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr, virQEMUDriver *driver, unsigned int parseFlags) { + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + /* Historically, isa-serial and the default matched, so in order to * maintain backwards compatibility we map them here. The actual default * will be picked below based on the architecture and machine type. */ @@ -5428,6 +5431,16 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr, } } + + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->source && + chr->source->type == VIR_DOMAIN_CHR_TYPE_FILE && + chr->source->data.file.append == VIR_TRISTATE_SWITCH_ABSENT) { + + chr->source->data.file.append = + virTristateSwitchTypeFromString(cfg->serialFileAppend); + } + return 0; } diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 1dbd692921..d1ca9c8d3d 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -117,3 +117,4 @@ module Test_libvirtd_qemu = } { "deprecation_behavior" = "none" } { "sched_core" = "none" } +{ "serial_file_append" = "default" } diff --git a/tests/qemuxml2argvdata/serial-append.xml b/tests/qemuxml2argvdata/serial-append.xml new file mode 100644 index 0000000000..662a711dd0 --- /dev/null +++ b/tests/qemuxml2argvdata/serial-append.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.off.xml b/tests/qemuxml2xmloutdata/serial-append.off.xml new file mode 100644 index 0000000000..83fd37a0d1 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.off.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file' append='off'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file' append='off'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.on.xml b/tests/qemuxml2xmloutdata/serial-append.on.xml new file mode 100644 index 0000000000..e54959a725 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.on.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.xml b/tests/qemuxml2xmloutdata/serial-append.xml new file mode 100644 index 0000000000..662a711dd0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e13da8bd2c..e4ccee0cf7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -915,6 +915,16 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_NOCAPS("serial-append"); + + g_free(cfg->serialFileAppend); + cfg->serialFileAppend = g_strdup("on"); + DO_TEST_FULL("serial-append", ".on", WHEN_BOTH, ARG_END); + + g_free(cfg->serialFileAppend); + cfg->serialFileAppend = g_strdup("off"); + DO_TEST_FULL("serial-append", ".off", WHEN_BOTH, ARG_END); + DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); -- 2.39.0

3 5

[PATCH] NEWS: document addition of passt support
by Laine Stump 10 Jan '23

10 Jan '23

Signed-off-by: Laine Stump <laine(a)redhat.com> --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index fecca64344..768208ed03 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -23,6 +23,16 @@ v9.0.0 (unreleased) ``virDomainSnapshotDelete()``. Flags that allow deleting children or children only are not supported. + * QEMU: support passt (https://passt.top) + + passt can be used to connect an emulated network device to the + host's network without requiring libvirt to have any sort of + elevated privileges. This is configured with:: + + <interface type='user'> + <backend type='passt'> + ... + * **Improvements** * qemu: Prefer PNG for domain screenshots -- 2.38.1

2 3

[PATCH] spec: Restart libvirtd on upgrade without socket activation
by Martin Kletzander 10 Jan '23

10 Jan '23

The %posttrans phase needs has a special case for upgrading libvirt daemon with --listen, but it forgot to also restart the daemon in order to run the new installed version. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1820437 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index d9529fc76c4a..77b274b6f91d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1449,6 +1449,7 @@ then libvirtd-admin.socket \ libvirtd-tls.socket \ libvirtd-tcp.socket >/dev/null 2>&1 || : + /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : else # Old libvirtd owns the sockets and will delete them on # shutdown. Can't use a try-restart as libvirtd will simply -- 2.39.0

3 2

[libvirt PATCH 0/9] src: misc cleanups related to remote protocol/client
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

Just before xmas I did some work on an rpcgen replacement so we can use a non-sucky API instead of xdr_*. This short series has some general cleanups I found useful. The rpcgen code will come later. While this is all non-functional changes, I'm NOT proposing it for 9.0, it can safely wait as it isn't fixing any real bugs (that I've realized). Daniel P. Berrangé (9): remote: remove redundant initialization of args variable lxc: fix XDR protocol compliance logging: remove redundant XDR typedef rpc: use VIR_LOCK_GUARD in remote client code remote: use VIR_LOCK_GUARD in client code admin: use VIR_LOCK_GUARD in client code rpc: use struct zero initializer instead of memset remote: use struct zero initializer instead of memset admin: use struct zero initializer instead of memset src/admin/admin_remote.c | 92 +-- src/logging/log_protocol.x | 2 - src/lxc/lxc_monitor_protocol.x | 6 +- src/remote/remote_driver.c | 1280 +++++++++----------------------- src/rpc/gendispatch.pl | 18 +- 5 files changed, 397 insertions(+), 1001 deletions(-) -- 2.38.1

2 10

[PATCH] qemu: Fix handling of passed FDs in remoteDispatchDomainFdAssociate
by Peter Krempa 10 Jan '23

10 Jan '23

To ensure same behaviour when remote driver is or is not used we must not steal the FDs and array holding them passed to qemuDomainFDAssociate but rather duplicate them. At the same time the remote driver must close and free them to prevent leak. Pointed out by Coverity as FD leak on error path: *** CID 404348: Resource leaks (RESOURCE_LEAK) /src/remote/remote_daemon_dispatch.c: 7484 in remoteDispatchDomainFdAssociate() 7478 rv = 0; 7479 7480 cleanup: 7481 if (rv < 0) 7482 virNetMessageSaveError(rerr); 7483 virObjectUnref(dom); >>> CID 404348: Resource leaks (RESOURCE_LEAK) >>> Variable "fds" going out of scope leaks the storage it points to. 7484 return rv; Fixes: abd9025c2fd Fixes: f762f87534e Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 15 ++++++++++++--- src/remote/remote_daemon_dispatch.c | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a88c9ebe64..d6879175fe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20442,7 +20442,8 @@ qemuDomainFDAssociate(virDomainPtr domain, { virDomainObj *vm = NULL; qemuDomainObjPrivate *priv; - virStorageSourceFDTuple *new; + g_autoptr(virStorageSourceFDTuple) new = NULL; + size_t i; int ret = -1; virCheckFlags(VIR_DOMAIN_FD_ASSOCIATE_SECLABEL_RESTORE | @@ -20460,8 +20461,16 @@ qemuDomainFDAssociate(virDomainPtr domain, priv = vm->privateData; new = virStorageSourceFDTupleNew(); - new->fds = fds; new->nfds = nfds; + new->fds = g_new0(int, new->nfds); + for (i = 0; i < new->nfds; i++) { + if ((new->fds[i] = dup(fds[i])) < 0) { + virReportSystemError(errno, + _("failed to duplicate passed fd with index '%zu'"), + i); + goto cleanup; + } + } new->conn = domain->conn; new->writable = flags & VIR_DOMAIN_FD_ASSOCIATE_SECLABEL_WRITABLE; @@ -20469,7 +20478,7 @@ qemuDomainFDAssociate(virDomainPtr domain, virCloseCallbacksDomainAdd(vm, domain->conn, qemuDomainFDHashCloseConnect); - g_hash_table_insert(priv->fds, g_strdup(name), new); + g_hash_table_insert(priv->fds, g_strdup(name), g_steal_pointer(&new)); ret = 0; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 40c734ce6b..6c56e9ec3e 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7478,6 +7478,9 @@ remoteDispatchDomainFdAssociate(virNetServer *server G_GNUC_UNUSED, rv = 0; cleanup: + for (i = 0; i < nfds; i++) + VIR_FORCE_CLOSE(fds[i]); + g_free(fds); if (rv < 0) virNetMessageSaveError(rerr); virObjectUnref(dom); -- 2.38.1

2 1

[PATCH 00/12] migration/migrationpin:support migration pin
by Jiang Jiacheng 10 Jan '23

10 Jan '23

Support set the CPU affinity of the live migration thread to improve the migration performance in specific cases. By default, the migration thread shares CPU resources with the VM process. With those API, support pin migration thread to expected CPU list to avoid preempting CPU resources of VM process. New API 'pinMigrationThread' and virsh command 'virsh migrationpin' is used to pin migration thread to expected CPU list before or during migration. New migration param 'migration.pin' is used to support migration pin via interface 'virDomainMigrateToURI3'. Jiang Jiacheng (2): migration/migration-pin: support migration thread pin by virsh command migration/migration-pin/multifd-pin: add migration pin status handle zhengchuan (10): migration/migration-pin: get migration pid for migration pin migration/migration-pin: pin migration pid by given cpumap migration/migration-pin: add qemu monitor callback functions migration/migration-pin: add migrationpin for migration parameters migration/migration-pin: get cpumap from migration.pin migration/migration-pin: add domainMigrationPid for qemuMonitorCallbacks migration/multifd-pin: get multifd pid for migration pin migration/multifd-pin: pin multifd pid by given cpumap migration/multifd-pin: add qemu monitor callback functions migration/multifd-pin: support migration multifd thread pin include/libvirt/libvirt-domain.h | 19 ++ src/conf/domain_conf.c | 9 + src/conf/domain_conf.h | 11 ++ src/conf/virconftypes.h | 2 + src/driver-hypervisor.h | 16 ++ src/libvirt-domain.c | 144 +++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 7 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 175 ++++++++++++++++++ src/qemu/qemu_migration.c | 5 + src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 21 +++ src/qemu/qemu_migration_params.h | 4 + src/qemu/qemu_monitor.c | 20 ++ src/qemu/qemu_monitor.h | 13 ++ src/qemu/qemu_monitor_json.c | 32 ++++ src/qemu/qemu_process.c | 303 +++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 15 ++ src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 43 ++++- src/remote_protocol-structs | 28 +++ src/util/vircgroup.c | 3 + src/util/vircgroup.h | 1 + tools/virsh-domain.c | 69 +++++++ 26 files changed, 954 insertions(+), 1 deletion(-) -- 2.33.0

2 17

[PATCH] conf: check vhost-user queues with vcpus
by Jiang Jiacheng 10 Jan '23

10 Jan '23

With kernel without the ref patch, if queues > vcpus, interrupts will be centralized on one vcpu affecting guest performance. After the ref patch merged, the queues whose number is greater than the number of vcpus will not be used. Considering the above, it's better to check the counts of vhost-user queues and vcpus. ref: https://patchwork.kernel.org/project/linux-scsi/cover/1553682995-5682-1-git… Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> --- src/conf/domain_validate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 95b8d9b419..6106e79999 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -308,7 +308,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDef **seclabels, static int -virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) +virDomainDiskVhostUserValidate(const virDomainDef *def, const virDomainDiskDef *disk) { if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -465,6 +465,12 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) return -1; } + if (disk->queues > virDomainDefGetVcpus(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vhost-user disk queues must <= vcpus")); + return -1; + } + return 0; } @@ -807,7 +813,7 @@ virDomainDiskDefValidate(const virDomainDef *def, } if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER && - virDomainDiskVhostUserValidate(disk) < 0) { + virDomainDiskVhostUserValidate(def, disk) < 0) { return -1; } -- 2.33.0

2 2

[PATCH 0/3] define g_autoptr for virNWFilterDef and virNWFilterRuleDef
by Jiang Jiacheng 10 Jan '23

10 Jan '23

Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label/variable. Those patches are followup with: https://gitlab.com/libvirt/libvirt/-/commit/a9027d447be789cd11c0aa18ceb83ed… Jiang Jiacheng (3): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef virNWFilterSaveConfig: remove the unnecessary variable 'ret' src/conf/nwfilter_conf.c | 52 ++++++++++++++-------------------- src/conf/nwfilter_conf.h | 2 ++ src/conf/virnwfilterobj.c | 19 ++++++------- src/nwfilter/nwfilter_driver.c | 7 ++--- tests/nwfilterxml2xmltest.c | 22 ++++++-------- 5 files changed, 42 insertions(+), 60 deletions(-) -- 2.33.0

2 6

[PATCH] remote: fix double free of migration params on error
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

The remote_*_args methods will generally borrow pointers passed in the caller, so should not be freed. On failure of the virTypedParamsSerialize method, however, xdr_free was being called. This is presumably because it was thought that the params may have been partially serialized and need cleaning up. This is incorrect, as virTypedParamsSerialize takes care to cleanup partially serialized data. This xdr_free call would lead to free'ing the borrowed cookie pointers, which would be a double free. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b0dba9057b..bb44d0004f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6919,8 +6919,6 @@ remoteDomainMigrateBegin3Params(virDomainPtr domain, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_begin3_params_args, - (char *) &args); goto cleanup; } @@ -6981,8 +6979,6 @@ remoteDomainMigratePrepare3Params(virConnectPtr dconn, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_prepare3_params_args, - (char *) &args); goto cleanup; } @@ -7063,8 +7059,6 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_args, - (char *) &args); goto cleanup; } @@ -7149,8 +7143,6 @@ remoteDomainMigratePerform3Params(virDomainPtr dom, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_perform3_params_args, - (char *) &args); goto cleanup; } @@ -7216,8 +7208,6 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_finish3_params_args, - (char *) &args); goto cleanup; } @@ -7284,8 +7274,6 @@ remoteDomainMigrateConfirm3Params(virDomainPtr domain, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_confirm3_params_args, - (char *) &args); goto cleanup; } -- 2.38.1

2 1

[PATCH] admin: fix leak of typed parameters on error
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

A few admin client methods had the xdr_free call the wrong side of the cleanup label, so typed parameters would not be freed on error. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/admin/admin_remote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 012488bff3..f99b93eef6 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -269,9 +269,9 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPtr srv, goto cleanup; rv = 0; - xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret); cleanup: + xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret); virObjectUnlock(priv); return rv; } @@ -342,9 +342,9 @@ remoteAdminClientGetInfo(virAdmClientPtr client, goto cleanup; rv = 0; - xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret); cleanup: + xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret); virObjectUnlock(priv); return rv; } @@ -380,10 +380,10 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv, goto cleanup; rv = 0; - xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret, - (char *) &ret); cleanup: + xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret, + (char *) &ret); virObjectUnlock(priv); return rv; } -- 2.38.1

2 1

[libvirt PATCH 0/2] docs: submitting-patches: shorten slightly
by Ján Tomko 10 Jan '23

10 Jan '23

Ján Tomko (2): docs: submimtting-patches: Remove emphasis on not cc'ing developers docs: submitting-patches: remove note about --patience docs/submitting-patches.rst | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) -- 2.39.0

3 4