- Devel - libvirt List Archives

[PATCH V3] libxl: Reject VM config referencing nwfilters
by Jim Fehlig 10 Oct '24

10 Oct '24

The Xen libxl driver does not support nwfilter. Introduce a deviceValidateCallback function with a check for nwfilters, returning VIR_ERR_CONFIG_UNSUPPORTED if any are found. Also fail to start any existing VMs referencing nwfilters. Drivers generally ignore unrecognized XML configuration, but ignoring a user's request to filter VM network traffic can be viewed as a security issue. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/UHG… Changes in V3: When starting a VM, use virDomainDefValidate to validate the def instead of duplicating the checks. Note: With the change in V3, the validation is only done when starting a new VM. Validation is skipped if restoring a managed saved VM. src/libxl/libxl_domain.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 0f129ec69c..029b12fa3b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -356,12 +356,30 @@ libxlDomainDefValidate(const virDomainDef *def, return 0; } +static int +libxlDomainDeviceDefValidate(const virDomainDeviceDef *dev, + const virDomainDef *def, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) +{ + if (dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->filter) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("filterref is not supported in %1$s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + + return 0; +} + + virDomainDefParserConfig libxlDomainDefParserConfig = { .macPrefix = { 0x00, 0x16, 0x3e }, .netPrefix = LIBXL_GENERATED_PREFIX_XEN, .devicesPostParseCallback = libxlDomainDeviceDefPostParse, .domainPostParseCallback = libxlDomainDefPostParse, .domainValidateCallback = libxlDomainDefValidate, + .deviceValidateCallback = libxlDomainDeviceDefValidate, .features = VIR_DOMAIN_DEF_FEATURE_USER_ALIAS | VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT | @@ -1460,6 +1478,10 @@ libxlDomainStartNew(libxlDriverPrivate *driver, managed_save_path); vm->hasManagedSave = false; + } else { + /* Validate configuration if starting a new VM */ + if (virDomainDefValidate(vm->def, 0, driver->xmlopt, NULL) < 0) + goto cleanup; } ret = libxlDomainStart(driver, vm, start_paused, restore_fd, restore_ver); -- 2.35.3

2 1

[PATCH] NEWS: Mention documention improvements of image format settings
by Jim Fehlig 10 Oct '24

10 Oct '24

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Although small, the change seems NEWS noteworthy. NEWS.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 7f4f33c8f8..dd9f261933 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -35,6 +35,14 @@ v10.9.0 (unreleased) Users are encouraged to report any occurence of the above message along with steps they took to the upstream tracker. + * qemu: improve documentation of image format settings + + The documentation of the various ``*_image_format`` settings in ``qemu.conf`` + imply they can only be used to control compression of the image. The + documentation has been improved to clarify the settings describe the + representation of guest memory blocks on disk, which includes compression + among other possible layouts. + * **Bug fixes** -- 2.35.3

2 1

[PATCH] lxc: fix variable storage order before call
by Adam Julis 10 Oct '24

10 Oct '24

virDomainConfNWFilterInstantiate() was called without updated net->ifname, it caused in some cases throwing error message. If function failed, change is reverted. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/658 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/lxc/lxc_process.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 205ab96ebb..b00608e30a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -271,6 +271,7 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, { g_autofree char *parentVeth = NULL; g_autofree char *containerVeth = NULL; + g_autofree char *backupIfname = NULL; const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net); VIR_DEBUG("calling vethCreate()"); @@ -315,14 +316,18 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, return NULL; } - if (net->filter && - virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) - return NULL; - - /* success is guaranteed, so update the interface object */ + /* success almost guaranteed, next function needs updated net->ifname */ + backupIfname = g_strdup(net->ifname); g_free(net->ifname); net->ifname = g_steal_pointer(&parentVeth); + if (net->filter && + virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) { + g_free(net->ifname); + net->ifname = g_steal_pointer(&backupIfname); + return NULL; + } + return g_steal_pointer(&containerVeth); } -- 2.45.2

2 1

[PATCH V2 0/2] qemu: Clarify purpose of image format settings
by Jim Fehlig 10 Oct '24

10 Oct '24

The current documentation of the various foo_image_format settings in qemu.conf subtly implies they are only used for specifying compression. Patch1 of this small series attempts to clarify and improve the description of the settings. It defines image format as a way to specify the desired layout of guest memory blocks on disk. Patch2 changes the use of 'compressed' with 'format' throughout the code, removing implication that format == compressed. V2: Replace more uses of 'compressed' with 'format' in patch2 Jim Fehlig (2): qemu: conf: Improve the foo_image_format setting descriptions qemu: Use consistent naming for save image format src/qemu/qemu.conf.in | 40 +++++++++++++++++++++++---------------- src/qemu/qemu_driver.c | 30 ++++++++++++++--------------- src/qemu/qemu_saveimage.c | 32 +++++++++++++++---------------- src/qemu/qemu_saveimage.h | 4 ++-- src/qemu/qemu_snapshot.c | 6 +++--- 5 files changed, 60 insertions(+), 52 deletions(-) -- 2.35.3

2 7

[PATCH 0/2] qemu: mention caveat with zero detection during migration and add NEWS
by Peter Krempa 10 Oct '24

10 Oct '24

Peter Krempa (2): docs: Add warning about using a cleared image with VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES_ZEROES NEWS: mention zero detection for non-shared-storage migration NEWS.rst | 11 +++++++++++ docs/manpages/virsh.rst | 4 +++- include/libvirt/libvirt-domain.h | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) -- 2.47.0

3 4

[PULL 0/2] chardev patches
by marcandre.lureau＠redhat.com 09 Oct '24

09 Oct '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> The following changes since commit 2af37e791906cfda42cb9604a16d218e56994bb1: Merge tag 'pull-request-2024-10-07' of https://gitlab.com/thuth/qemu into staging (2024-10-07 12:55:02 +0100) are available in the Git repository at: https://gitlab.com/marcandre.lureau/qemu.git tags/chr-pull-request for you to fetch changes up to b74cb8761c68275240af0826086590a03a1f419d: chardev: add path option for pty backend (2024-10-09 12:13:05 +0400) ---------------------------------------------------------------- chardev: introduce 'reconnect-ms' and deprecate 'reconnect' chardev: add path option for pty backend ---------------------------------------------------------------- Daniil Tatianin (1): chardev: introduce 'reconnect-ms' and deprecate 'reconnect' Octavian Purdila (1): chardev: add path option for pty backend docs/about/deprecated.rst | 6 +++++ qapi/char.json | 44 ++++++++++++++++++++++++++++++++--- include/chardev/char-socket.h | 2 +- chardev/char-pty.c | 33 ++++++++++++++++++++++++++ chardev/char-socket.c | 33 +++++++++++++++++++------- chardev/char.c | 8 +++++++ qemu-options.hx | 33 +++++++++++++++++++++----- 7 files changed, 140 insertions(+), 19 deletions(-) -- 2.47.0

2 3

[PATCH v3 00/10] qemu: Rework internal active snapshots to use QMP commands
by Peter Krempa 09 Oct '24

09 Oct '24

Changes to v2: - added few cleanups - added qemumonitorjson test cases for new commands - dropped duplicate capability flags - fixed bugs pointed out in v2 - rewritten logic for selecting snapshot images (both for creation/deletion) - fixed the logic to be fault tolerant same way as 'delvm' - allowed internal snapshots of VMs with UEFI - added explanation to all code with non-obvious implications Nikolai Barybin via Devel (4): qemu: monitor: Add plumbing for 'snaphot-save'/'snapshot-delete' QMP commands qemu: blockjob: Add job types for 'snapshot-save/delete' qemu: capabilities: Introduce QEMU_CAPS_SNAPSHOT_INTERNAL_QMP capability qemu snapshot: use QMP snapshot-save for internal snapshots creation Peter Krempa (6): qemuDomainObjWait: Annotate with G_GNUC_WARN_UNUSED_RESULT qemu: monitor: Store internal snapshot names from 'query-named-block-nodes' qemu snapshot: use QMP snapshot-delete for internal snapshots deletion qemuSnapshotActiveInternalDeleteGetDevices: Add warning when deleting inconsistent snapshot qemu: snapshot: Allow internal snapshots with PFLASH nvram news: mention internal snapshot changes NEWS.rst | 16 + src/qemu/qemu_block.c | 2 + src/qemu/qemu_blockjob.c | 7 + src/qemu/qemu_blockjob.h | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_domain.c | 10 + src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_monitor.c | 30 ++ src/qemu/qemu_monitor.h | 17 + src/qemu/qemu_monitor_json.c | 79 ++++ src/qemu/qemu_monitor_json.h | 13 + src/qemu/qemu_snapshot.c | 358 +++++++++++++++++- tests/qemublocktest.c | 11 + .../bitmap/snapshots-internal.json | 298 +++++++++++++++ .../bitmap/snapshots-internal.out | 2 + .../caps_6.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 + .../caps_6.0.0_x86_64.xml | 1 + .../caps_6.1.0_x86_64.xml | 1 + .../caps_6.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 + .../caps_6.2.0_x86_64.xml | 1 + .../caps_7.0.0_aarch64+hvf.xml | 1 + .../caps_7.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 + .../caps_7.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_riscv64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + .../caps_8.2.0_aarch64.xml | 1 + .../caps_8.2.0_armv7l.xml | 1 + .../caps_8.2.0_loongarch64.xml | 1 + .../qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 + .../caps_8.2.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 + .../caps_9.0.0_x86_64.xml | 1 + .../caps_9.1.0_riscv64.xml | 1 + .../caps_9.1.0_x86_64.xml | 1 + tests/qemumonitorjsontest.c | 33 ++ 46 files changed, 895 insertions(+), 22 deletions(-) create mode 100644 tests/qemublocktestdata/bitmap/snapshots-internal.json create mode 100644 tests/qemublocktestdata/bitmap/snapshots-internal.out -- 2.46.0

3 18

[PATCH 0/7] qemu: Fix some more migration issues related to vmx-* features
by Jiri Denemark 09 Oct '24

09 Oct '24

Sigh. Jiri Denemark (7): qemu: Drop vmx-* from migratable CPU model only when origCPU is set qemu: Do not drop unknown CPU features from domain XML cpu-data.py: Properly handle aliases qemu: Translate vmx-invvpid-single-context-noglobals CPU feature qemu: Replace big condition in virQEMUCapsCPUFilterFeatures with array cpu_map: Drop vmx-ept-{uc,wb} features from CPU models cpu_map: Drop vmx-invvpid-single-context from CPU models src/cpu_map/sync_qemu_features_i386.py | 3 -- src/cpu_map/sync_qemu_models_i386.py | 5 ++- src/cpu_map/x86_Broadwell-IBRS.xml | 2 -- src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 2 -- src/cpu_map/x86_Broadwell-noTSX.xml | 2 -- src/cpu_map/x86_Broadwell.xml | 2 -- src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 2 -- src/cpu_map/x86_Cascadelake-Server.xml | 2 -- src/cpu_map/x86_Cooperlake.xml | 2 -- src/cpu_map/x86_GraniteRapids.xml | 2 -- src/cpu_map/x86_Haswell-IBRS.xml | 2 -- src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 2 -- src/cpu_map/x86_Haswell-noTSX.xml | 2 -- src/cpu_map/x86_Haswell.xml | 2 -- src/cpu_map/x86_Icelake-Server-noTSX.xml | 2 -- src/cpu_map/x86_Icelake-Server.xml | 2 -- src/cpu_map/x86_IvyBridge-IBRS.xml | 2 -- src/cpu_map/x86_IvyBridge.xml | 2 -- src/cpu_map/x86_Nehalem-IBRS.xml | 2 -- src/cpu_map/x86_Nehalem.xml | 2 -- src/cpu_map/x86_SandyBridge-IBRS.xml | 2 -- src/cpu_map/x86_SandyBridge.xml | 2 -- src/cpu_map/x86_SapphireRapids.xml | 2 -- src/cpu_map/x86_Skylake-Client-IBRS.xml | 2 -- src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 2 -- src/cpu_map/x86_Skylake-Client.xml | 2 -- src/cpu_map/x86_Skylake-Server-IBRS.xml | 2 -- src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 2 -- src/cpu_map/x86_Skylake-Server.xml | 2 -- src/cpu_map/x86_Snowridge.xml | 2 -- src/cpu_map/x86_Westmere-IBRS.xml | 2 -- src/cpu_map/x86_Westmere.xml | 2 -- src/qemu/qemu_capabilities.c | 19 +++++++---- src/qemu/qemu_command.c | 13 +++++++- src/qemu/qemu_domain.c | 26 +++++++-------- src/qemu/qemu_process.c | 32 ------------------- tests/cputestdata/cpu-data.py | 5 +++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 2 +- .../x86_64-cpuid-Atom-P5362-json.xml | 1 + .../x86_64-cpuid-Cooperlake-enabled.xml | 2 +- .../x86_64-cpuid-Cooperlake-json.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 2 +- .../x86_64-cpuid-Core-i7-8550U-json.xml | 1 + ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 2 +- .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 1 + ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 1 + 46 files changed, 53 insertions(+), 123 deletions(-) -- 2.46.2

2 8

[PATCH 0/6] docs: link fixes and improvements
by Peter Krempa 09 Oct '24

09 Oct '24

*** BLURB HERE *** Peter Krempa (6): docs: remote: Replace broken link to article about 'ssh-agent' docs: Reject non-https external links kbase: Fix link in 'merging_disk_image_chains' article docs: Use relative links within the web page docs: newreposetup: Drop section about 'libvirt project server' docs: Prohibit 'external' links within the webpage docs/api_extension.rst | 4 +- docs/issue-handling.rst | 2 +- docs/kbase/backing_chains.rst | 4 +- docs/kbase/debuglogs.rst | 4 +- docs/kbase/internals/incremental-backup.rst | 6 +- docs/kbase/launch_security_sev.rst | 2 +- docs/kbase/live_full_disk_backup.rst | 2 +- docs/kbase/merging_disk_image_chains.rst | 6 +- docs/kbase/rpm-deployment.rst | 2 +- docs/kbase/s390_protected_virt.rst | 2 +- docs/kbase/systemtap.rst | 2 +- docs/meson.build | 4 ++ docs/newreposetup.rst | 34 ----------- docs/remote.rst | 2 +- docs/securityprocess.rst | 2 +- docs/testtck.rst | 2 +- docs/windows.rst | 5 +- scripts/check-html-references.py | 67 +++++++++++++++++++-- 18 files changed, 86 insertions(+), 66 deletions(-) -- 2.46.0

2 7

[PATCH 0/5] network: fix regression in firewalld zone setting
by Laine Stump 08 Oct '24

08 Oct '24

commit v10.7.0-76-g1a72b83d56 improperly assumed that reloading firewalld wouldn't reset the firewalld zone of libvirt-managed bridge devices. This resulted in loss of networking to guests when something on the host triggered a reload of firewalld rules, reported here: https://issues.redhat.com/browse/RHEL-61576 This new series of patches, reverts that commit, along with commit v10.7.0-78-g200f60b2e1, then reimplements their functionality assuming that a firewalld reload *will* reset the zone of all libvirt-managed bridge devices. Laine Stump (5): Revert "network: *un*set the firewalld zone while shutting down a network" Revert "network: support setting firewalld zone for bridge device of open networks" network: call network(Add|Remove)FirewallRules() for forward mode='open' network: a different way of supporting firewalld zone for mode='open' networks network: a different implementation of *un*setting firewalld zone when network is destroyed src/network/bridge_driver.c | 34 +++---- src/network/bridge_driver_linux.c | 140 ++++++++++++++++----------- src/network/bridge_driver_nop.c | 19 ---- src/network/bridge_driver_platform.h | 4 - src/util/virfirewalld.c | 16 +-- 5 files changed, 102 insertions(+), 111 deletions(-) -- 2.46.1

2 7

[PATCH v2 0/1] Add support for RAPL MSRs feature in QEMU
by Anthony Harivel 07 Oct '24

07 Oct '24

Hi, First of all, kudos to Peter Krempa for his fast review! In this v2, I've addressed the following points: - The socket is *not* mandatory and my code totally confused Peter. Sorry about that! here a snippet of the QEMU code to understand: /* Compute the socket path if necessary */ if (s->msr_energy.socket_path == NULL) { s->msr_energy.socket_path = vmsr_compute_default_paths(); } So I made all the modification to make it not necessary. - Change the socket name to "rapl_helper_socket" - Change the socket to be absFilePath - I did not add anything to honour the _OFF state, because it is not necessary to explicitly disable it. That's about it. Regards, Anthony Anthony Harivel (1): qemu: Add support for RAPL MSRs feature docs/formatdomain.rst | 2 ++ src/conf/domain_conf.c | 18 ++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/conf/schemas/domaincommon.rng | 10 ++++++++++ src/qemu/qemu_command.c | 11 +++++++++++ tests/qemuxmlconfdata/kvm-features-off.xml | 1 + .../kvm-features.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/kvm-features.xml | 1 + 8 files changed, 46 insertions(+), 1 deletion(-) -- 2.46.0

3 14

[PATCH v2 0/4] Add TPM emulator <source file=''/>
by marcandre.lureau＠redhat.com 04 Oct '24

04 Oct '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, When swtpm capabilities reports "nvram-backend-dir", it can accepts a single file or block device where TPM state will be stored. --tpmstate must be backend-uri=file://. v2: - add <source dir='..'/> support as well (Daniel) Related: https://issues.redhat.com/browse/CNV-35250 Marc-André Lureau (4): util: check swtpm nvram-backend-dir capability schema: add TPM emulator <source file='..'> schema: add TPM emulator <source dir='..'> qemu_tpm: handle file/block storage source docs/formatdomain.rst | 18 +++++ src/conf/domain_conf.c | 28 +++++++ src/conf/domain_conf.h | 7 ++ src/conf/schemas/domaincommon.rng | 20 +++++ src/qemu/qemu_tpm.c | 76 +++++++++++++++---- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + .../qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 1 + tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + 9 files changed, 140 insertions(+), 13 deletions(-) -- 2.45.2.827.g557ae147e6

5 22

[PATCH 0/2] add disk hotplug/unplug support to test hypervisor
by John Levon 04 Oct '24

04 Oct '24

John Levon (2): test_driver: provide basic disk hotplug support test_driver: provide basic disk hotunplug support src/test/test_driver.c | 276 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 3 deletions(-) -- 2.34.1

1 2

[PATCH] util: Look for newer name of cpu wait time statistic
by Martin Kletzander 03 Oct '24

03 Oct '24

It looks like linux changed the key for wait time in /proc/<pid>/sched and /proc/<pid>/task/<tid>/sched files in commit ceeadb83aea2 (or around that time) from se.statistics.wait_sum to just wait_sum. Similarly to the previous change (from se.wait_sum) just look for the new name first. Resolves: https://issues.redhat.com/browse/RHEL-60030 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virprocess.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f1e5e4decd68..dd4bd866102e 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1849,8 +1849,10 @@ virProcessGetSchedInfo(unsigned long long *cpuWait, const char *line = lines[i]; /* Needs CONFIG_SCHEDSTATS. The second check + * is the name used before ceeadb83aea2, the third one * is the old name the kernel used in past */ - if (STRPREFIX(line, "se.statistics.wait_sum") || + if (STRPREFIX(line, "wait_sum") || + STRPREFIX(line, "se.statistics.wait_sum") || STRPREFIX(line, "se.wait_sum")) { line = strchr(line, ':'); if (!line) { -- 2.46.2

2 1

[PATCH v7 00/14] qemu: Introduce shared_filesystems configuration option
by Andrea Bolognani 03 Oct '24

03 Oct '24

The need to have something like this in the first place is driven by KubeVirt (see [1] and [2]). A draft version of this series has been integrated into KubeVirt and it has been confirmed that it was effective in removing the need to use LD_PRELOAD hacks in the storage provider. Changes from [v6]: * only skip metadata locking for the swtpm lock file; * other tweaks based on review feedback. Changes from [v5]: * make migration of domains with TPM work (patches 12 and 13); * fixed all typos for "remember"; * added R-bs for Peter's patches. Changes from [v4] (v5 was posted by Peter): * added patch 7 cleaning up a helper function (noticed just while reading the code) * added patch 8 properly unrefing security labels in dac/selinux drivers on outgoing migration * patch 11: added handling of the 'nvram' image file (and refactored the function to allow reuse) Changes from [v3] (v4 was posted by Peter): * patch 2/8 was modified to change the docs for the new option. * patches 1-5 will get an R-b by me as I've adopted them. * patches 6, 9-11 are new. * patches 7, 8 were not part of v3 Changes from [v2]: * added canonicalization for user-provided paths; * fixed compilation issues when AppArmor support is enabled. Changes from [v1]: * documented more explicitly that the newly introduced option is intended for very specific scenarios and not general usage; as part of this, the NEWS update has been dropped too; * made a few tweaks and addressed a few oversight based on review feedback; * several preparatory cleanup patches have been pushed. Changes from [v0]: * reworked approach. [v6] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/7TTR… [v5] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/HNF5… [v4] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/FWR7… [v3] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/PISB… [v2] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/XPCP… [v1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/XEIS… [v0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/MMKV… [1] https://issues.redhat.com/browse/CNV-34322 [2] https://issues.redhat.com/browse/CNV-39370 Andrea Bolognani (8): security: Fix alignment qemu: Introduce shared_filesystems configuration option qemu: Propagate shared_filesystems utils: Use overrides in virFileIsSharedFS() qemu: Always set labels for TPM state security: Always forget labels for TPM state directory security: Allow skipping locking when labeling lock files qemu: Handle locking of TPM state directory for incoming migration Peter Krempa (6): virFileIsSharedFSOverride: Export virParseOwnershipIds: Refactor virSecuritySELinuxRestoreImageLabelInt: Move FD image relabeling after 'migrated' check security_(dac|selinux): Unref remembered security labels on outgoing migration storage_source: Add field for skipping seclabel remembering qemu: migration: Don't remember seclabel for images shared from current host src/conf/storage_source_conf.c | 3 + src/conf/storage_source_conf.h | 9 ++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 4 +- src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf.in | 26 +++++ src/qemu/qemu_conf.c | 31 ++++++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_migration.c | 83 ++++++++++++++-- src/qemu/qemu_security.c | 147 ++++++++++++++++++++-------- src/qemu/qemu_security.h | 6 +- src/qemu/qemu_tpm.c | 51 +++++++--- src/qemu/qemu_tpm.h | 10 +- src/qemu/test_libvirtd_qemu.aug.in | 5 + src/security/security_apparmor.c | 8 +- src/security/security_dac.c | 61 +++++++++--- src/security/security_driver.h | 11 ++- src/security/security_manager.c | 54 ++++++++--- src/security/security_manager.h | 15 ++- src/security/security_nop.c | 5 + src/security/security_selinux.c | 151 +++++++++++++++++++++++------ src/security/security_stack.c | 38 ++++++-- src/util/virfile.c | 63 +++++++++++- src/util/virfile.h | 5 +- src/util/virutil.c | 20 ++-- tests/securityselinuxlabeltest.c | 2 +- tests/virfiletest.c | 2 +- 31 files changed, 666 insertions(+), 164 deletions(-) -- 2.46.2

2 19

[PATCH V2 0/4] Rework qemu internal active snapshots to use QMP
by Nikolai Barybin 03 Oct '24

03 Oct '24

Den, Peter, Daniel thank you for your comments! I'm sending v2 of this patchset. Changes since last revision: - dropped [PATCH 4/4] qemu monitor: reap qemu_monitor_text - added new patch: qemu capabilities: add QEMU_CAPS_SNAPSHOT_SAVE/_DELETE - preserved old-style snapshotting (HMP savevm) in case we have QEMU < 6.0 - enhanced requirements for allowing snapshotting. All writable disks should be qcow2, non-shared. If such disks exist and we have qcow2 NVRAM, add NVRAM device to the list of wrdevs. But never save vmstate to NVRAM - make char** wrdevs list allocation inside qemuSnapshotActiveInternalGetWrdevListHelper() Nikolai Barybin (4): qemu monitor: add snaphot-save/delete QMP commands qemu blockjob: add snapshot-save/delete job types qemu capabilities: add QEMU_CAPS_SNAPSHOT_SAVE/_DELETE qemu snapshot: use QMP snapshot-save/delete for internal snapshots src/qemu/qemu_block.c | 2 + src/qemu/qemu_blockjob.c | 6 +- src/qemu/qemu_blockjob.h | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_domain.c | 4 + src/qemu/qemu_monitor.c | 30 +++ src/qemu/qemu_monitor.h | 13 ++ src/qemu/qemu_monitor_json.c | 66 ++++++ src/qemu/qemu_monitor_json.h | 13 ++ src/qemu/qemu_snapshot.c | 207 ++++++++++++++++-- .../caps_6.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 2 + .../caps_6.0.0_x86_64.xml | 2 + .../caps_6.1.0_x86_64.xml | 2 + .../caps_6.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 + .../caps_6.2.0_x86_64.xml | 2 + .../caps_7.0.0_aarch64+hvf.xml | 2 + .../caps_7.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 + .../caps_7.0.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 + .../caps_7.1.0_x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 + .../caps_7.2.0_x86_64+hvf.xml | 2 + .../caps_7.2.0_x86_64.xml | 2 + .../caps_8.0.0_riscv64.xml | 2 + .../caps_8.0.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 2 + .../caps_8.1.0_x86_64.xml | 2 + .../caps_8.2.0_aarch64.xml | 2 + .../caps_8.2.0_armv7l.xml | 2 + .../caps_8.2.0_loongarch64.xml | 2 + .../qemucapabilitiesdata/caps_8.2.0_s390x.xml | 2 + .../caps_8.2.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_9.0.0_sparc.xml | 2 + .../caps_9.0.0_x86_64.xml | 2 + .../caps_9.1.0_x86_64.xml | 2 + 39 files changed, 391 insertions(+), 14 deletions(-) -- 2.43.5

2 14

[PATCH 0/2] add NIC hotplug support to test hypervisor
by John Levon 03 Oct '24

03 Oct '24

These two patches add basic support for NIC hot[un]plug to the test hypervisor, based on the qemu driver; only ethernet and bridge type VNICS are currently supported. John Levon (2): test_driver: provide basic NIC hotplug support test_driver: provide basic NIC hotunplug support src/test/test_driver.c | 305 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 283 insertions(+), 22 deletions(-) -- 2.34.1

2 9

[PATCH v6 00/13] qemu: Introduce shared_filesystems configuration option
by Andrea Bolognani 02 Oct '24

02 Oct '24

The need to have something like this in the first place is driven by KubeVirt (see [1] and [2]). A draft version of this series has been integrated into KubeVirt and it has been confirmed that it was effective in removing the need to use LD_PRELOAD hacks in the storage provider. Changes from [v5]: * make migration of domains with TPM work (patches 12 and 13); * fixed all typos for "remember"; * added R-bs for Peter's patches. Changes from [v4] (v5 was posted by Peter): * added patch 7 cleaning up a helper function (noticed just while reading the code) * added patch 8 properly unrefing security labels in dac/selinux drivers on outgoing migration * patch 11: added handling of the 'nvram' image file (and refactored the function to allow reuse) Changes from [v3] (v4 was posted by Peter): * patch 2/8 was modified to change the docs for the new option. * patches 1-5 will get an R-b by me as I've adopted them. * patches 6, 9-11 are new. * patches 7, 8 were not part of v3 Changes from [v2]: * added canonicalization for user-provided paths; * fixed compilation issues when AppArmor support is enabled. Changes from [v1]: * documented more explicitly that the newly introduced option is intended for very specific scenarios and not general usage; as part of this, the NEWS update has been dropped too; * made a few tweaks and addressed a few oversight based on review feedback; * several preparatory cleanup patches have been pushed. Changes from [v0]: * reworked approach. [v5] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/HNF… [v4] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/FWR… [v3] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/PIS… [v2] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/XPCP… [v1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/XEIS… [v0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/MMKV… [1] https://issues.redhat.com/browse/CNV-34322 [2] https://issues.redhat.com/browse/CNV-39370 Andrea Bolognani (7): security: Fix alignment qemu: Introduce shared_filesystems configuration option qemu: Propagate shared_filesystems utils: Use overrides in virFileIsSharedFS() qemu: Always set labels for TPM state security: Always forget labels for TPM state directory qemu: Don't lock TPM state directory for incoming migration Peter Krempa (6): virFileIsSharedFSOverride: Export virParseOwnershipIds: Refactor virSecuritySELinuxRestoreImageLabelInt: Move FD image relabeling after 'migrated' check security_(dac|selinux): Unref remembered security labels on outgoing migration storage_source: Add field for skipping seclabel remembering qemu: migration: Don't remember seclabel for images shared from current host src/conf/storage_source_conf.c | 3 + src/conf/storage_source_conf.h | 9 ++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 4 +- src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf.in | 26 +++++ src/qemu/qemu_conf.c | 31 ++++++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_migration.c | 86 ++++++++++++++--- src/qemu/qemu_security.c | 95 +++++++++++++----- src/qemu/qemu_security.h | 6 +- src/qemu/qemu_tpm.c | 50 ++++++---- src/qemu/qemu_tpm.h | 10 +- src/qemu/test_libvirtd_qemu.aug.in | 5 + src/security/security_apparmor.c | 8 +- src/security/security_dac.c | 53 +++++++++-- src/security/security_driver.h | 8 +- src/security/security_manager.c | 33 +++++-- src/security/security_manager.h | 9 +- src/security/security_nop.c | 5 + src/security/security_selinux.c | 148 +++++++++++++++++++++++------ src/security/security_stack.c | 32 +++++-- src/util/virfile.c | 63 +++++++++++- src/util/virfile.h | 5 +- src/util/virutil.c | 20 ++-- tests/securityselinuxlabeltest.c | 2 +- tests/virfiletest.c | 2 +- 31 files changed, 594 insertions(+), 139 deletions(-) -- 2.46.0

2 17

[PATCH v2] domain_validate: Validate dma_translation for iommu models
by Han Han 02 Oct '24

02 Oct '24

The attribute dma_translation is only supported by intel-iommu device. Report an error when it is used for the other iommu devices. Fixes: 6866f958c1 Signed-off-by: Han Han <hhan(a)redhat.com> --- v2: update the tests v1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/6CHF… src/conf/domain_validate.c | 3 ++- ...io-iommu-dma-translation.x86_64-latest.err | 1 + .../virtio-iommu-dma-translation.xml | 20 +++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxmlconfdata/virtio-iommu-dma-translation.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/virtio-iommu-dma-translation.xml diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index eddb4a5e74..b8ae9ed79d 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2980,7 +2980,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) iommu->caching_mode != VIR_TRISTATE_SWITCH_ABSENT || iommu->eim != VIR_TRISTATE_SWITCH_ABSENT || iommu->iotlb != VIR_TRISTATE_SWITCH_ABSENT || - iommu->aw_bits != 0) { + iommu->aw_bits != 0 || + iommu->dma_translation != VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support additional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); diff --git a/tests/qemuxmlconfdata/virtio-iommu-dma-translation.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-iommu-dma-translation.x86_64-latest.err new file mode 100644 index 0000000000..2c3a272725 --- /dev/null +++ b/tests/qemuxmlconfdata/virtio-iommu-dma-translation.x86_64-latest.err @@ -0,0 +1 @@ +XML error: iommu model 'virtio' doesn't support additional attributes diff --git a/tests/qemuxmlconfdata/virtio-iommu-dma-translation.xml b/tests/qemuxmlconfdata/virtio-iommu-dma-translation.xml new file mode 100644 index 0000000000..a3723f266b --- /dev/null +++ b/tests/qemuxmlconfdata/virtio-iommu-dma-translation.xml @@ -0,0 +1,20 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + </os> + <features> + <acpi/> + </features> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' model='none'/> + <memballoon model='none'/> + <iommu model='virtio'> + <driver dma_translation='on'/> + </iommu> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 61eb4cda75..dfcf67d2d0 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2766,6 +2766,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-no-acpi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-invalid-address-type"); DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-invalid-address"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-dma-translation"); DO_TEST_CAPS_LATEST("cpu-hotplug-startup"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("cpu-hotplug-granularity", "ppc64"); -- 2.46.1

2 1

[PATCH 0/2] libxl_conf: Fix crashes in libxl config generation
by Rayhan Faizel 02 Oct '24

02 Oct '24

This patch series includes fixes for config generation of multiple serial devices and handling of unsupported graphics types. Both of these were discovered some time back using fuzzing techniques. Rayhan Faizel (2): libxl_conf: Fix config generation for multiple serial devices libxl_conf: Add check for unsupported graphics type src/libxl/libxl_conf.c | 15 +++-- .../multiple-serial.json | 63 +++++++++++++++++++ .../multiple-serial.xml | 47 ++++++++++++++ .../libxlxml2domconfigdata/single-serial.json | 52 +++++++++++++++ .../libxlxml2domconfigdata/single-serial.xml | 25 ++++++++ tests/libxlxml2domconfigtest.c | 3 + 6 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/multiple-serial.json create mode 100644 tests/libxlxml2domconfigdata/multiple-serial.xml create mode 100644 tests/libxlxml2domconfigdata/single-serial.json create mode 100644 tests/libxlxml2domconfigdata/single-serial.xml -- 2.34.1

2 4

[PATCH v3] docs: Mark "gluster" support in QEMU as deprecated
by Thomas Huth 02 Oct '24

02 Oct '24

According to https://marc.info/?l=fedora-devel-list&m=171934833215726 the GlusterFS development effectively ended. Thus mark it as deprecated in QEMU, so we can remove it in a future release if the project does not gain momentum again. Acked-by: Niels de Vos <ndevos(a)redhat.com> Acked-by: Markus Armbruster <armbru(a)redhat.com> Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- v3: Some rewordings according to Markus' and Daniel's suggestions docs/about/deprecated.rst | 9 +++++++++ qapi/block-core.json | 8 +++++++- block/gluster.c | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index c0aa52def5..c41e55f710 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -414,6 +414,15 @@ Specifying the iSCSI password in plain text on the command line using the used instead, to refer to a ``--object secret...`` instance that provides a password via a file, or encrypted. +``gluster`` backend (since 9.2) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +According to https://marc.info/?l=fedora-devel-list&m=171934833215726 +the GlusterFS development effectively ended. Unless the development +gains momentum again, the QEMU project will remove the gluster backend +in a future release. + + Character device options '''''''''''''''''''''''' diff --git a/qapi/block-core.json b/qapi/block-core.json index c3b0a2376b..8181abef54 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3192,12 +3192,18 @@ # # @snapshot-access: Since 7.0 # +# Features: +# +# @deprecated: Member @gluster is deprecated because GlusterFS +# development ceased. +# # Since: 2.9 ## { 'enum': 'BlockdevDriver', 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', 'cloop', 'compress', 'copy-before-write', 'copy-on-read', 'dmg', - 'file', 'snapshot-access', 'ftp', 'ftps', 'gluster', + 'file', 'snapshot-access', 'ftp', 'ftps', + {'name': 'gluster', 'features': [ 'deprecated' ] }, {'name': 'host_cdrom', 'if': 'HAVE_HOST_BLOCK_DEVICE' }, {'name': 'host_device', 'if': 'HAVE_HOST_BLOCK_DEVICE' }, 'http', 'https', diff --git a/block/gluster.c b/block/gluster.c index f8b415f381..f03d05251e 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -809,6 +809,8 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, goto out; } + warn_report_once("'gluster' is deprecated"); + filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME); s->debug = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG, -- 2.46.1

1 0

[libvirt PATCH 0/6] scripts: group-qemu-caps: improve readability
by Ján Tomko 02 Oct '24

02 Oct '24

Even though it still stays a Perl script at heart. Ján Tomko (6): scripts: group-qemu-caps: use read scripts: group-qemu-caps: remove cryptic bool scripts: group-qemu-caps: remove unecessary regex scripts: group-qemu-caps: separate file loading scripts: group-qemu-caps: regroup_caps: operate on split lines scripts: group-qemu-caps: separate file operations from the check scripts/group-qemu-caps.py | 120 +++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 52 deletions(-) -- 2.45.2

2 7

[PATCH] vmx: support HPET timers configuration
by João Sena Ribeiro 02 Oct '24

02 Oct '24

All VMs are being created with no hpet timer defined. Check if the VM definition XML file enables HPET and reflect that on the VMX file. Signed-off-by: João Sena Ribeiro <joao.ribeiro(a)identity.pt> --- src/vmx/vmx.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index de16c1f634..d7e116dd07 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -65,7 +65,7 @@ def->maxvcpus = <value> <=> numvcpus = "<value>" def->cpumask = <uint list> <=> sched.cpu.affinity = "<uint list>" def->cputune.shares = <value> <=> sched.cpu.shares = "<value>" # with handling for special values # "high", "normal", "low" - +def->ntimers <=> hpet.present = "<value>" # "true", "false" ################################################################################ @@ -3496,6 +3496,35 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef } } + /* def:clock.ntimers */ + for (i = 0; i < def->clock.ntimers; i++) { + switch ((virDomainTimerNameType)def->clock.timers[i]->name) { + case VIR_DOMAIN_TIMER_NAME_HPET: + if (def->clock.timers[i]->present == VIR_TRISTATE_BOOL_YES) { + virBufferAddLit(&buffer, "hpet0.present = \"true\"\n"); + } else if (def->clock.timers[i]->present == VIR_TRISTATE_BOOL_NO) { + virBufferAddLit(&buffer, "hpet0.present = \"false\"\n"); + } + break; + + case VIR_DOMAIN_TIMER_NAME_TSC: + case VIR_DOMAIN_TIMER_NAME_PLATFORM: + case VIR_DOMAIN_TIMER_NAME_KVMCLOCK: + case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: + case VIR_DOMAIN_TIMER_NAME_RTC: + case VIR_DOMAIN_TIMER_NAME_PIT: + case VIR_DOMAIN_TIMER_NAME_ARMVTIMER: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported timer type (name) '%1$s'"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name)); + goto cleanup; + + case VIR_DOMAIN_TIMER_NAME_LAST: + break; + + } + } + /* def:graphics */ for (i = 0; i < def->ngraphics; ++i) { switch (def->graphics[i]->type) { -- 2.34.1

2 1

[PATCH] qemu: add hook script event "stop"
by Adam Julis 02 Oct '24

02 Oct '24

The "stop" hook is called when the process of stopping a guest started and it is known that the process can be completed (e.g. the guest is still active). Resolves: https://gitlab.com/libvirt/libvirt/-/issues/647 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- docs/hooks.rst | 14 +++++++++++--- src/qemu/qemu_process.c | 10 ++++++++++ src/util/virhook.c | 1 + src/util/virhook.h | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/docs/hooks.rst b/docs/hooks.rst index 48128ba3d8..508d5afc4e 100644 --- a/docs/hooks.rst +++ b/docs/hooks.rst @@ -202,9 +202,17 @@ operation. There is no specific operation to indicate a "restart" is occurring. /etc/libvirt/hooks/qemu guest_name started begin - -- When a QEMU guest is stopped, the qemu hook script is called in two - locations, to match the startup. First, :since:`since 0.8.0`, the hook is - called before libvirt restores any labels: +- Before a QEMU guest is stopped, the qemu hook script is called in three + locations, to match the startup. First, :since:`since 10.8.0`, the hook is + called after libvirt checks that guest is still active and whole stopping + procedure should be run: + + :: + + /etc/libvirt/hooks/qemu guest_name stop begin - + + The second location, :since:`since 0.8.0`, the hook is called before libvirt + restores any labels: :: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2e4ee9e305..f12c4a97a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8615,6 +8615,7 @@ qemuProcessBeginStopJob(virDomainObj *vm, * is supposed to call qemuProcessStop (which will reset it after * 'vm->def->id' is set to -1) and/or qemuProcessEndStopJob to do proper * cleanup. */ + return 0; error: @@ -8676,6 +8677,15 @@ void qemuProcessStop(virQEMUDriver *driver, goto endjob; } + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + g_autofree char *xml = qemuDomainDefFormatXML(driver, NULL, vm->def, 0); + + /* we can't stop the operation even if the script raised an error */ + ignore_value(virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_STOP, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL)); + } + /* BEWARE: At this point 'vm->def->id' is not cleared yet. Any code that * requires the id (e.g. to call virDomainDefGetShortName()) must be placed * between here (after the VM is killed) and the statement clearing the id. diff --git a/src/util/virhook.c b/src/util/virhook.c index d012bb1825..01ba17e406 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -76,6 +76,7 @@ VIR_ENUM_IMPL(virHookSubop, VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST, "start", + "stop", "stopped", "prepare", "release", diff --git a/src/util/virhook.h b/src/util/virhook.h index d8237c837e..ea8c540c3f 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -52,6 +52,7 @@ typedef enum { typedef enum { VIR_HOOK_QEMU_OP_START, /* domain is about to start */ + VIR_HOOK_QEMU_OP_STOP, /* domain is about to stop */ VIR_HOOK_QEMU_OP_STOPPED, /* domain has stopped */ VIR_HOOK_QEMU_OP_PREPARE, /* domain startup initiated */ VIR_HOOK_QEMU_OP_RELEASE, /* domain destruction is over */ -- 2.45.2

2 1

[PATCH 0/6] ch: handle events from cloud-hypervisor
by Purna Pavan Chandra Aekkaladevi 01 Oct '24

01 Oct '24

cloud-hypervisor raises various events, including VM lifecylce operations such as boot, shutdown, pause, resume, etc. Libvirt will now read these events and take the necessary actions, such as correctly updating the domain state. A FIFO file is passed to `--event-monitor` option of cloud-hypervisor. Libvirt creates a new thread that acts as the reader of the fifo file and continuously monitors for new events. Currently, shutdown events are handled by updating the domain state appropriately. Purna Pavan Chandra Aekkaladevi (6): utils: Implement virFileIsNamedPipe ch: pass --event-monitor option to cloud-hypervisor ch: start a new thread for handling ch events ch: events: Read and parse cloud-hypervisor events ch: events: facilitate lifecycle events handling NEWS: Mention event handling support in ch driver NEWS.rst | 7 + po/POTFILES | 1 + src/ch/ch_events.c | 337 +++++++++++++++++++++++++++++++++++++++ src/ch/ch_events.h | 54 +++++++ src/ch/ch_monitor.c | 48 +++++- src/ch/ch_monitor.h | 11 ++ src/ch/meson.build | 2 + src/libvirt_private.syms | 1 + src/util/virfile.c | 8 + src/util/virfile.h | 1 + 10 files changed, 466 insertions(+), 4 deletions(-) create mode 100644 src/ch/ch_events.c create mode 100644 src/ch/ch_events.h -- 2.34.1

2 18