October 2026 - Devel - libvirt List Archives

[PATCH 0/4] qemu: backup: Add support for FD passing for output images and sparsifying of full backup output
by Peter Krempa 20 Oct '26

20 Oct '26

Peter Krempa (4): schemas: Introduce 'fdgroup' type and refactor uses qemu: don't create files for fd-passed new images backup: Allow FD-passing for backup output/scratch file backup: Add support for sparsifying output images of full backups docs/formatbackup.rst | 5 +++++ src/conf/backup_conf.c | 18 +++++++++++++++++- src/conf/backup_conf.h | 2 ++ src/conf/schemas/domainbackup.rng | 14 +++++++++++++- src/conf/schemas/domaincommon.rng | 18 ++++++++++++------ src/qemu/qemu_backup.c | 6 ++++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_snapshot.c | 2 +- .../domainbackupxml2xmlin/backup-pull-fd.xml | 4 ++-- .../backup-push-sparsify.xml | 12 ++++++++++++ .../domainbackupxml2xmlout/backup-pull-fd.xml | 4 ++-- .../backup-push-sparsify.xml | 19 +++++++++++++++++++ tests/genericxml2xmltest.c | 1 + 13 files changed, 93 insertions(+), 14 deletions(-) create mode 100644 tests/domainbackupxml2xmlin/backup-push-sparsify.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push-sparsify.xml -- 2.56.0

2 5

[PATCH] docs: Remove stale chapter on RISC-V 'Z' CPU properties
by Philippe Mathieu-Daudé 20 Oct '26

20 Oct '26

RISC-V 'Z' CPU properties were removed in commit 455c0fa9eef, for the release v10.1.0. Remove the stale comment. Fixes: 455c0fa9eef ("target/riscv: remove capital 'Z' CPU properties") Signed-off-by: Philippe Mathieu-Daudé <philmd(a)oss.qualcomm.com> --- docs/about/deprecated.rst | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ccbc4219497..368fa1b4ed3 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -349,30 +349,6 @@ the addition of volatile memory support, it is now necessary to distinguish between persistent and volatile memory backends. As such, memdev is deprecated in favor of persistent-memdev. - -RISC-V CPU properties which start with capital 'Z' (since 8.2) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -All RISC-V CPU properties which start with capital 'Z' are being deprecated -starting in 8.2. The reason is that they were wrongly added with capital 'Z' -in the past. CPU properties were later added with lower-case names, which -is the format we want to use from now on. - -Users which try to use these deprecated properties will receive a warning -recommending to switch to their stable counterparts: - -- "Zifencei" should be replaced with "zifencei" -- "Zicsr" should be replaced with "zicsr" -- "Zihintntl" should be replaced with "zihintntl" -- "Zihintpause" should be replaced with "zihintpause" -- "Zawrs" should be replaced with "zawrs" -- "Zfa" should be replaced with "zfa" -- "Zfh" should be replaced with "zfh" -- "Zfhmin" should be replaced with "zfhmin" -- "Zve32f" should be replaced with "zve32f" -- "Zve64f" should be replaced with "zve64f" -- "Zve64d" should be replaced with "zve64d" - Block device options '''''''''''''''''''' -- 2.55.0

4 6

[PATCH] docs: Clarify 'query-kvm' deprecation release
by Philippe Mathieu-Daudé 19 Oct '26

19 Oct '26

'query-kvm' was deprecated in commit 824141dcf48, merged after the v11.1.0 release. Correct to prevent too early removal. Fixes: 824141dcf48 ("hw/core: Deprecate query-kvm") Signed-off-by: Philippe Mathieu-Daudé <philmd(a)oss.qualcomm.com> --- docs/about/deprecated.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ccbc4219497..2507a86d1ee 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -168,7 +168,7 @@ Use ``job-dismiss`` instead. Use ``job-finalize`` instead. -``query-kvm`` (since 11.0) +``query-kvm`` (since 11.1) '''''''''''''''''''''''''' Use ``query-accelerators`` instead. -- 2.55.0

2 1

[PATCH v4 0/7] Add TLS-PSK support for migration
by Abhisek Panda 19 Oct '26

19 Oct '26

QEMU provides the capability to encrypt the migration data stream using two transport layer security (TLS) authentication schemes: X.509 certificates and pre-shared keys (PSK). Currently, Libvirt only supports the X.509-based TLS authentication scheme. In TLS X.509 certificates, a set of live migrations utilize a fixed set of static certificates for encrypted migration. In this authentication scheme, users require to deploy a certificate authority and monitor the certificate expiration window. In case certificates are compromised all the future live migrations are vulnerable. To resolve this, this patch series introduce the support for pre-shared key-based authentication scheme. This mechanism relies on symmetric pre-shared keys (a secret key that is known to both sender and receiver prior to secure communication) for providing secure transfer of data. Libvirt solely manages the lifecycle of the ephemeral pre-shared keys, including, generation, persistent storage, and cleanup. Libvirt generates the key on the source machine, then transfers it to the destination machine using the migration cookie. To allow users to configure the size of the key, Libvirt provides the migrate_tls_psk_length configuration parameter in qemu.conf. We enable the PSK-based TLS authentication scheme if both source and destination supports the tls-creds-psk object regardless of the value of VIR_MIGRATE_TLS flag. Else, we use the X.509-based TLS authentication scheme if the VIR_MIGRATE_TLS flag is set. v4: 1. Enable TLS-PSK if source and destination supports it regardless of the VIR_MIGRATE_TLS flag. 2. If either source or destination does not support TLS-PSK and the VIR_MIGRATE_TLS flag is set then fallback to TLS X509 v3: 1. Destination host decides which TLS authentication scheme to use. 2. The directory of the key file is set to <tls_psk_state_dir>/$ID-$VMNAME. 3. Use the same alias for both tls-creds-x509 and tls-creds-psk objects. 4. Validate the length of the pre-shared key. 5. Unit test to validate the pre-shared key in the migration cookie. v2: 1. Libvirt manages the lifecycle of pre-shared keys. 2. Transfer of keys to the destination via the migration cookie 3. Remove the VIR_MIGRATE_TLS_PSK flag instead rely on VIR_MIGRATE_TLS and availability of ca-cert.pem on source. 4. Drop VIR_MIGRATE_PARAM_TLS_PSK_DIRECTORY, Libvirt solely manages the pre-shared keys. Abhisek Panda (7): conf: Add a configuration param for TLS-PSK qemu: Manage a pre-shared key's lifecycle qemu: Add support to build the tls-creds-psk object qemu: rename tls-creds-x509 obj related functions qemu: Manage tls-creds-psk object lifecycle qemu: Set up the migrate TLS-PSK objects tests: Add testing of pre-shared key lifecycle include/libvirt/libvirt-domain.h | 10 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 8 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 26 +++ src/qemu/qemu_command.h | 7 + src/qemu/qemu_conf.c | 22 +++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 40 ++--- src/qemu/qemu_hotplug.h | 24 +-- src/qemu/qemu_migration.c | 170 +++++++++++++++--- src/qemu/qemu_migration.h | 3 + src/qemu/qemu_migration_cookie.c | 79 +++++++- src/qemu/qemu_migration_cookie.h | 5 + src/qemu/qemu_migration_params.c | 98 ++++++++-- src/qemu/qemu_migration_params.h | 22 ++- src/qemu/qemu_process.c | 3 + src/qemu/test_libvirtd_qemu.aug.in | 1 + .../caps_10.0.0_aarch64.xml | 1 + .../caps_10.0.0_ppc64.xml | 1 + .../caps_10.0.0_s390x.xml | 1 + .../caps_10.0.0_x86_64+amdsev.xml | 1 + .../caps_10.0.0_x86_64.xml | 1 + .../caps_10.1.0_s390x.xml | 1 + .../caps_10.1.0_x86_64+inteltdx.xml | 1 + .../caps_10.1.0_x86_64.xml | 1 + .../caps_10.2.0_aarch64.xml | 1 + .../caps_10.2.0_x86_64+mshv.xml | 1 + .../caps_10.2.0_x86_64.xml | 1 + .../caps_11.0.0_aarch64.xml | 1 + .../caps_11.0.0_s390x.xml | 1 + .../caps_11.0.0_x86_64+sgx.xml | 1 + .../caps_11.0.0_x86_64.xml | 1 + .../caps_11.1.0_aarch64.xml | 1 + .../caps_11.1.0_s390x.xml | 1 + .../caps_11.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_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 + .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 + .../caps_9.1.0_x86_64.xml | 1 + .../caps_9.2.0_aarch64+hvf.xml | 1 + .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + .../caps_9.2.0_x86_64+amdsev.xml | 1 + .../caps_9.2.0_x86_64.xml | 1 + tests/qemumigrationcookiexmltest.c | 135 +++++++++++++- tests/testutilsqemu.c | 12 ++ 62 files changed, 632 insertions(+), 85 deletions(-) -- 2.43.7

2 12

[PATCH] bhyve: capabilities: use virBitmap to store capabilities
by Roman Bogorodskiy 19 Oct '26

19 Oct '26

Similarly to the qemu driver, store bhyve capabilities in virBitmap. Add helpers to work with capabilities: virBhyveCapsGet(), virBhyveCapsSet(), and virBhyveCapsClear(). No functional changes. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 107 ++++++++++++++++++++------------ src/bhyve/bhyve_capabilities.h | 50 +++++++++------ src/bhyve/bhyve_command.c | 30 ++++----- src/bhyve/bhyve_domain.c | 4 +- src/bhyve/bhyve_driver.c | 17 ++--- src/bhyve/bhyve_driver.h | 2 +- src/bhyve/bhyve_parse_command.c | 16 ++--- src/bhyve/bhyve_parse_command.h | 2 +- src/bhyve/bhyve_process.c | 2 +- src/bhyve/bhyve_utils.h | 3 +- tests/bhyveargv2xmltest.c | 4 +- tests/bhyvexml2argvtest.c | 54 +++++++++------- tests/bhyvexml2xmltest.c | 9 ++- tests/domaincapstest.c | 20 +++--- 14 files changed, 187 insertions(+), 133 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 5d07d16f69..42da2a7c47 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -42,6 +42,30 @@ VIR_LOG_INIT("bhyve.bhyve_capabilities"); +void +virBhyveCapsSet(virBitmap *caps, + virBhyveCapsFlags flag) +{ + ignore_value(virBitmapSetBit(caps, flag)); +} + + +void +virBhyveCapsClear(virBitmap *caps, + virBhyveCapsFlags flag) +{ + ignore_value(virBitmapClearBit(caps, flag)); +} + + +bool +virBhyveCapsGet(virBitmap *caps, + virBhyveCapsFlags flag) +{ + return caps && virBitmapIsBitSet(caps, flag); +} + + virCaps * virBhyveCapsBuild(void) { @@ -69,7 +93,7 @@ virBhyveCapsBuild(void) int virBhyveDomainCapsFill(virDomainCaps *caps, - unsigned int bhyvecaps, + virBitmap *bhyvecaps, virDomainCapsStringValues *firmwares) { caps->disk.supported = VIR_TRISTATE_BOOL_YES; @@ -87,7 +111,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, caps->os.supported = VIR_TRISTATE_BOOL_YES; caps->os.loader.supported = VIR_TRISTATE_BOOL_NO; - if (bhyvecaps & BHYVE_CAP_LPC_BOOTROM) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_LPC_BOOTROM)) { caps->os.loader.type.report = true; caps->os.loader.readonly.report = true; caps->os.loader.supported = VIR_TRISTATE_BOOL_YES; @@ -103,7 +127,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, caps->graphics.supported = VIR_TRISTATE_BOOL_NO; caps->video.supported = VIR_TRISTATE_BOOL_NO; - if (bhyvecaps & BHYVE_CAP_FBUF) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_FBUF)) { caps->graphics.supported = VIR_TRISTATE_BOOL_YES; caps->graphics.type.report = true; caps->video.supported = VIR_TRISTATE_BOOL_YES; @@ -112,7 +136,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, VIR_DOMAIN_CAPS_ENUM_SET(caps->video.modelType, VIR_DOMAIN_VIDEO_TYPE_GOP); } - if (bhyvecaps & BHYVE_CAP_VIRTIO_RND) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_VIRTIO_RND)) { caps->rng.supported = VIR_TRISTATE_BOOL_YES; caps->rng.model.report = true; caps->rng.backendModel.report = true; @@ -121,7 +145,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, VIR_DOMAIN_CAPS_ENUM_SET(caps->rng.backendModel, VIR_DOMAIN_RNG_BACKEND_RANDOM); } - if (bhyvecaps & BHYVE_CAP_LPC_TPM) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_LPC_TPM)) { caps->tpm.supported = VIR_TRISTATE_BOOL_YES; caps->tpm.model.report = true; caps->tpm.backendModel.report = true; @@ -156,7 +180,7 @@ virBhyveDomainCapsBuild(struct _bhyveConn *conn, virDomainVirtType virttype) { virDomainCaps *caps = NULL; - unsigned int bhyve_caps = 0; + g_autoptr(virBitmap) bhyve_caps = NULL; g_autoptr(DIR) dir = NULL; struct dirent *entry; size_t firmwares_alloc = 0; @@ -222,12 +246,12 @@ virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) } static int -bhyveProbeCapsDeviceHelper(unsigned int *caps, +bhyveProbeCapsDeviceHelper(virBitmap *caps, char *binary, const char *bus, const char *device, const char *errormsg, - unsigned int flag) + virBhyveCapsFlags flag) { g_autofree char *error = NULL; g_autoptr(virCommand) cmd = NULL; @@ -240,13 +264,13 @@ bhyveProbeCapsDeviceHelper(unsigned int *caps, return -1; if (strstr(error, errormsg) == NULL) - *caps |= flag; + virBhyveCapsSet(caps, flag); return 0; } static int -bhyveProbeCapsFromHelp(unsigned int *caps, char *binary) +bhyveProbeCapsFromHelp(virBitmap *caps, char *binary) { g_autofree char *help = NULL; g_autoptr(virCommand) cmd = NULL; @@ -259,52 +283,52 @@ bhyveProbeCapsFromHelp(unsigned int *caps, char *binary) return -1; if (strstr(help, "-u:") != NULL) - *caps |= BHYVE_CAP_RTC_UTC; + virBhyveCapsSet(caps, BHYVE_CAP_RTC_UTC); /* "-c vcpus" was there before CPU topology support was introduced, * then it became * "-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n] */ if (strstr(help, "-c vcpus") == NULL) - *caps |= BHYVE_CAP_CPUTOPOLOGY; + virBhyveCapsSet(caps, BHYVE_CAP_CPUTOPOLOGY); if (strstr(help, "-A:") != NULL) - *caps |= BHYVE_CAP_ACPI; + virBhyveCapsSet(caps, BHYVE_CAP_ACPI); if (strstr(help, "-n:") != NULL) - *caps |= BHYVE_CAP_NUMA; + virBhyveCapsSet(caps, BHYVE_CAP_NUMA); if (strstr(help, "-M:") != NULL) - *caps |= BHYVE_CAP_MONITOR; + virBhyveCapsSet(caps, BHYVE_CAP_MONITOR); return 0; } static int -bhyveFillCapForDevice(unsigned int *caps, const char *device) +bhyveFillCapForDevice(virBitmap *caps, const char *device) { if (STREQ(device, "ahci")) - *caps |= BHYVE_CAP_AHCI32SLOT; + virBhyveCapsSet(caps, BHYVE_CAP_AHCI32SLOT); else if (STREQ(device, "e1000")) - *caps |= BHYVE_CAP_NET_E1000; + virBhyveCapsSet(caps, BHYVE_CAP_NET_E1000); else if (STREQ(device, "fbuf")) - *caps |= BHYVE_CAP_FBUF; + virBhyveCapsSet(caps, BHYVE_CAP_FBUF); else if (STREQ(device, "hda")) - *caps |= BHYVE_CAP_SOUND_HDA; + virBhyveCapsSet(caps, BHYVE_CAP_SOUND_HDA); else if (STREQ(device, "nvme")) - *caps |= BHYVE_CAP_NVME; + virBhyveCapsSet(caps, BHYVE_CAP_NVME); else if (STREQ(device, "virtio-9p")) - *caps |= BHYVE_CAP_VIRTIO_9P; + virBhyveCapsSet(caps, BHYVE_CAP_VIRTIO_9P); else if (STREQ(device, "virtio-rnd")) - *caps |= BHYVE_CAP_VIRTIO_RND; + virBhyveCapsSet(caps, BHYVE_CAP_VIRTIO_RND); else if (STREQ(device, "xhci")) - *caps |= BHYVE_CAP_XHCI; + virBhyveCapsSet(caps, BHYVE_CAP_XHCI); return 0; } static int -bhyveProbeCapsFromSHelp(unsigned int *caps, char *binary) +bhyveProbeCapsFromSHelp(virBitmap *caps, char *binary) { g_autofree char *help = NULL; g_autoptr(virCommand) cmd = NULL; @@ -328,7 +352,7 @@ bhyveProbeCapsFromSHelp(unsigned int *caps, char *binary) } static int -bhyveProbeCapsLpcBootrom(unsigned int *caps, char *binary) +bhyveProbeCapsLpcBootrom(virBitmap *caps, char *binary) { return bhyveProbeCapsDeviceHelper(caps, binary, "-l", @@ -339,7 +363,7 @@ bhyveProbeCapsLpcBootrom(unsigned int *caps, char *binary) static int -bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) +bhyveProbeCapsVNCPassword(virBitmap *caps, char *binary) { return bhyveProbeCapsDeviceHelper(caps, binary, "-s", @@ -350,7 +374,7 @@ bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) static int -bhyveProbeCapsLpcTpm(unsigned int *caps, char *binary) +bhyveProbeCapsLpcTpm(virBitmap *caps, char *binary) { return bhyveProbeCapsDeviceHelper(caps, binary, "-l", @@ -361,7 +385,7 @@ bhyveProbeCapsLpcTpm(unsigned int *caps, char *binary) static void -bhyveProbeCapsRctl(unsigned int *caps) +bhyveProbeCapsRctl(virBitmap *caps) { bool racct_enable; size_t racct_enable_len; @@ -376,13 +400,13 @@ bhyveProbeCapsRctl(unsigned int *caps) return; if (racct_enable) - *caps |= BHYVE_CAP_RCTL; + virBhyveCapsSet(caps, BHYVE_CAP_RCTL); return; } static int -bhyveProbeCapsBhyvectl(unsigned int *caps) +bhyveProbeCapsBhyvectl(virBitmap *caps) { g_autofree char *binary = virFindFileInPath("bhyvectl"); g_autofree char *help = NULL; @@ -399,14 +423,15 @@ bhyveProbeCapsBhyvectl(unsigned int *caps) return -1; if (strstr(help, "--get-vm-pid") != NULL) - *caps |= BHYVE_CAP_GET_VMPID; + virBhyveCapsSet(caps, BHYVE_CAP_GET_VMPID); return 0; } int -virBhyveProbeCaps(unsigned int *caps) +virBhyveProbeCaps(virBitmap **caps) { + g_autoptr(virBitmap) bitmap = virBitmapNew(BHYVE_CAP_LAST); char *binary; int ret = 0; @@ -414,27 +439,29 @@ virBhyveProbeCaps(unsigned int *caps) if (binary == NULL) goto out; - if ((ret = bhyveProbeCapsFromHelp(caps, binary))) + if ((ret = bhyveProbeCapsFromHelp(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsFromSHelp(caps, binary))) + if ((ret = bhyveProbeCapsFromSHelp(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsLpcBootrom(caps, binary))) + if ((ret = bhyveProbeCapsLpcBootrom(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsVNCPassword(caps, binary))) + if ((ret = bhyveProbeCapsVNCPassword(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsBhyvectl(caps))) + if ((ret = bhyveProbeCapsBhyvectl(bitmap))) goto out; - bhyveProbeCapsRctl(caps); + bhyveProbeCapsRctl(bitmap); - if ((ret = bhyveProbeCapsLpcTpm(caps, binary))) + if ((ret = bhyveProbeCapsLpcTpm(bitmap, binary))) goto out; out: + if (ret == 0) + *caps = g_steal_pointer(&bitmap); VIR_FREE(binary); return ret; } diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 35ca214538..90e604c41b 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -24,12 +24,13 @@ #include "capabilities.h" #include "conf/domain_capabilities.h" +#include "virbitmap.h" #include "bhyve_utils.h" virCaps *virBhyveCapsBuild(void); int virBhyveDomainCapsFill(virDomainCaps *caps, - unsigned int bhyvecaps, + virBitmap *bhyvecaps, virDomainCapsStringValues *firmwares); virDomainCaps *virBhyveDomainCapsBuild(bhyveConn *conn, const char *emulatorbin, @@ -43,25 +44,34 @@ typedef enum { } virBhyveGrubCapsFlags; typedef enum { - BHYVE_CAP_RTC_UTC = 1 << 0, - BHYVE_CAP_AHCI32SLOT = 1 << 1, - BHYVE_CAP_NET_E1000 = 1 << 2, - BHYVE_CAP_LPC_BOOTROM = 1 << 3, - BHYVE_CAP_FBUF = 1 << 4, - BHYVE_CAP_XHCI = 1 << 5, - BHYVE_CAP_CPUTOPOLOGY = 1 << 6, - BHYVE_CAP_SOUND_HDA = 1 << 7, - BHYVE_CAP_VNC_PASSWORD = 1 << 8, - BHYVE_CAP_VIRTIO_9P = 1 << 9, - BHYVE_CAP_VIRTIO_RND = 1 << 10, - BHYVE_CAP_NVME = 1 << 11, - BHYVE_CAP_ACPI = 1 << 12, - BHYVE_CAP_NUMA = 1 << 13, - BHYVE_CAP_RCTL = 1 << 14, - BHYVE_CAP_MONITOR = 1 << 15, - BHYVE_CAP_GET_VMPID = 1 << 16, - BHYVE_CAP_LPC_TPM = 1 << 17, + BHYVE_CAP_RTC_UTC, + BHYVE_CAP_AHCI32SLOT, + BHYVE_CAP_NET_E1000, + BHYVE_CAP_LPC_BOOTROM, + BHYVE_CAP_FBUF, + BHYVE_CAP_XHCI, + BHYVE_CAP_CPUTOPOLOGY, + BHYVE_CAP_SOUND_HDA, + BHYVE_CAP_VNC_PASSWORD, + BHYVE_CAP_VIRTIO_9P, + BHYVE_CAP_VIRTIO_RND, + BHYVE_CAP_NVME, + BHYVE_CAP_ACPI, + BHYVE_CAP_NUMA, + BHYVE_CAP_RCTL, + BHYVE_CAP_MONITOR, + BHYVE_CAP_GET_VMPID, + BHYVE_CAP_LPC_TPM, + + BHYVE_CAP_LAST, } virBhyveCapsFlags; +void virBhyveCapsSet(virBitmap *caps, + virBhyveCapsFlags flag) ATTRIBUTE_NONNULL(1); +void virBhyveCapsClear(virBitmap *caps, + virBhyveCapsFlags flag) ATTRIBUTE_NONNULL(1); +bool virBhyveCapsGet(virBitmap *caps, + virBhyveCapsFlags flag); + int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); -int virBhyveProbeCaps(unsigned int *caps); +int virBhyveProbeCaps(virBitmap **caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index dac3146785..09ef61e798 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -60,7 +60,7 @@ bhyveBuildNetArgStr(const virDomainDef *def, if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO) { nic_model = "virtio-net"; } else if (net->model == VIR_DOMAIN_NET_MODEL_E1000) { - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NET_E1000) != 0) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_NET_E1000)) { nic_model = "e1000"; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -272,7 +272,7 @@ bhyveBuildTPMArgStr(const virDomainDef *def G_GNUC_UNUSED, struct _bhyveConn *driver, virCommand *cmd) { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_TPM)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_LPC_TPM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support TPM devices")); return -1; @@ -333,13 +333,13 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, switch (disk->device) { case VIR_DOMAIN_DISK_DEVICE_DISK: - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_AHCI32SLOT)) + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_AHCI32SLOT)) virBufferAsprintf(&device, ",hd:%s", disk_source); else virBufferAsprintf(&device, "-hd,%s", disk_source); break; case VIR_DOMAIN_DISK_DEVICE_CDROM: - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_AHCI32SLOT)) + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_AHCI32SLOT)) virBufferAsprintf(&device, ",cd:%s", disk_source); else virBufferAsprintf(&device, "-cd,%s", disk_source); @@ -488,7 +488,7 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def, if (disk->bus != VIR_DOMAIN_DISK_BUS_NVME) continue; - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NVME)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_NVME)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Bhyve version does not support NVMe")); return -1; @@ -716,7 +716,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, bool escapeAddr; unsigned short port; - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_BOOTROM) || + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_LPC_BOOTROM) || def->os.bootloader || !def->os.loader) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -724,7 +724,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, return -1; } - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_FBUF)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_FBUF)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Bhyve version does not support framebuffer")); return -1; @@ -791,7 +791,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, } if (graphics->data.vnc.auth.passwd) { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_VNC_PASSWORD)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_VNC_PASSWORD)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("VNC Password authentication not supported by bhyve")); return -1; @@ -805,7 +805,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, virBufferAsprintf(&opt, ",password=%s", graphics->data.vnc.auth.passwd); } else { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_VNC_PASSWORD)) + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_VNC_PASSWORD)) VIR_WARN("%s", _("Security warning: VNC auth is not supported.")); else VIR_WARN("%s", _("Security warning: VNC is used without authentication.")); @@ -836,7 +836,7 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UNUSED, { g_auto(virBuffer) params = VIR_BUFFER_INITIALIZER; - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_SOUND_HDA)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_SOUND_HDA)) { /* Currently, bhyve only supports "hda" sound devices, so if it's not supported, sound devices are not supported at all */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -1157,7 +1157,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, return NULL; } - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_CPUTOPOLOGY) != 0) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_CPUTOPOLOGY)) { virCommandAddArgFormat(cmd, "cpus=%d,sockets=%d,cores=%d,threads=%d", nvcpus, def->cpu->sockets, @@ -1189,7 +1189,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, /* NUMA */ if (ncells) { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NUMA)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_NUMA)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support NUMA configuration")); return NULL; @@ -1222,7 +1222,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, /* Options */ if ((def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON) && - (bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_ACPI)) + virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_ACPI)) /* As of FreeBSD commit * https://cgit.freebsd.org/src/commit/?id=6a0e7f908802b86ca5d1c0b3c404b8391d0… * bhyve(8) generates ACPI tables unconditionally, so nothing needs to be done @@ -1238,7 +1238,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, /* used by default in bhyve */ break; case VIR_DOMAIN_CLOCK_OFFSET_UTC: - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RTC_UTC) != 0) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_RTC_UTC)) { virCommandAddArg(cmd, "-u"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -1279,7 +1279,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (ARCH_IS_X86(arch)) { - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_BOOTROM)) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_LPC_BOOTROM)) { virBufferAsprintf(&buf, "bootrom,%s", def->os.loader->path); if (def->os.loader->nvram && def->os.loader->nvram->path) virBufferAsprintf(&buf, ",%s", def->os.loader->nvram->path); diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 142d01e016..0ee2e06664 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -157,7 +157,7 @@ bhyveDomainDefPostParse(virDomainDef *def, /* When not specified in the domain XML, clock.offset defaults to UTC which is * not supported by bhyve on ARM64. So force it to LOCALTIME. */ if ((def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_UTC) && - !(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RTC_UTC)) + !virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_RTC_UTC)) def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; /* bhyve/arm64 does not provide the bhyveload(8) tool, @@ -237,7 +237,7 @@ bhyveDomainDiskDefAssignAddress(struct _bhyveConn *driver, case VIR_DOMAIN_DISK_BUS_SATA: def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; - if ((driver->bhyvecaps & BHYVE_CAP_AHCI32SLOT) != 0) { + if (virBhyveCapsGet(driver->bhyvecaps, BHYVE_CAP_AHCI32SLOT)) { def->info.addr.drive.controller = idx / 32; def->info.addr.drive.unit = idx % 32; } else { diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4c4ba9b0ba..47ed7d6963 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -783,7 +783,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, return NULL; } - if ((bhyveDriverGetBhyveCaps(privconn) & BHYVE_CAP_LPC_BOOTROM) == 0) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(privconn), BHYVE_CAP_LPC_BOOTROM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support bootrom")); return NULL; @@ -1377,6 +1377,7 @@ bhyveStateCleanup(void) virSysinfoDefFree(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->domainEventState); virPortAllocatorRangeFree(bhyve_driver->remotePorts); + virBitmapFree(bhyve_driver->bhyvecaps); if (bhyve_driver->lockFD != -1) virPidFileRelease(bhyve_driver->config->stateDir, "driver", bhyve_driver->lockFD); @@ -1421,13 +1422,15 @@ bhyveStateInitialize(bool privileged, if (virBhyveProbeCaps(&bhyve_driver->bhyvecaps) < 0) goto cleanup; - if (!privileged && !(bhyveDriverGetBhyveCaps(bhyve_driver) & BHYVE_CAP_MONITOR)) { + if (!privileged && + !virBhyveCapsGet(bhyveDriverGetBhyveCaps(bhyve_driver), BHYVE_CAP_MONITOR)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("bhyve does not support monitor mode, cannot run unprivileged")); goto cleanup; } - if (!privileged && !(bhyveDriverGetBhyveCaps(bhyve_driver) & BHYVE_CAP_GET_VMPID)) { + if (!privileged && + !virBhyveCapsGet(bhyveDriverGetBhyveCaps(bhyve_driver), BHYVE_CAP_GET_VMPID)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("bhyvectl does not support querying the VM PID, cannot run unprivileged")); goto cleanup; @@ -1513,12 +1516,12 @@ bhyveStateInitialize(bool privileged, return VIR_DRV_STATE_INIT_ERROR; } -unsigned +virBitmap * bhyveDriverGetBhyveCaps(struct _bhyveConn *driver) { if (driver != NULL) return driver->bhyvecaps; - return 0; + return NULL; } unsigned @@ -1774,7 +1777,7 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn, { g_autoptr(virDomainDef) def = NULL; struct _bhyveConn *privconn = conn->privateData; - unsigned bhyveCaps = bhyveDriverGetBhyveCaps(privconn); + virBitmap *bhyveCaps = bhyveDriverGetBhyveCaps(privconn); virCheckFlags(0, NULL); @@ -2409,7 +2412,7 @@ bhyveDomainSetMemoryParameters(virDomainPtr domain, return -1; if (def) { - if ((bhyveDriverGetBhyveCaps(privconn) & BHYVE_CAP_RCTL) == 0) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(privconn), BHYVE_CAP_RCTL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot set resource limits: RACCT/RCTL is either not supported or not enabled")); goto endjob; diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index 3f86081910..49ba7bbddb 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -25,7 +25,7 @@ int bhyveRegister(void); -unsigned bhyveDriverGetBhyveCaps(struct _bhyveConn *driver); +virBitmap *bhyveDriverGetBhyveCaps(struct _bhyveConn *driver); unsigned bhyveDriverGetGrubCaps(struct _bhyveConn *driver); diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 3d9a6f3964..fd8d062c31 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -253,7 +253,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, static int bhyveParseBhyveLPCArg(virDomainDef *def, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, const char *arg) { /* -l emulation[,config] */ @@ -391,7 +391,7 @@ bhyveParsePCISlot(const char *slotdef, static int bhyveParsePCIDisk(virDomainDef *def, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned pcibus, unsigned pcislot, unsigned function, @@ -461,7 +461,7 @@ bhyveParsePCIDisk(virDomainDef *def, static int bhyveParsePCINet(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned bus, unsigned slot, unsigned function, @@ -536,7 +536,7 @@ bhyveParsePCINet(virDomainDef *def, static int bhyveParsePCIFbuf(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned bus, unsigned slot, unsigned function, @@ -644,7 +644,7 @@ bhyveParsePCIFbuf(virDomainDef *def, static int bhyveParsePCIRND(virDomainDef *def, virDomainXMLOption *xmlopt G_GNUC_UNUSED, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned bus, unsigned slot, unsigned function, @@ -733,7 +733,7 @@ bhyveParsePassthru(virDomainDef *def G_GNUC_UNUSED, static int bhyveParseBhyvePCIArg(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps, + virBitmap *caps, unsigned *nvirtiodisk, unsigned *nahcidisk, const char *arg) @@ -822,7 +822,7 @@ bhyveParseBhyvePCIArg(virDomainDef *def, static int bhyveParseBhyveCommandLine(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps, + virBitmap *caps, int argc, char **argv) { int vcpus = 1; @@ -1025,7 +1025,7 @@ bhyveParseCustomLoaderCommandLine(virDomainDef *def, virDomainDef * bhyveParseCommandLineString(const char* nativeConfig, - unsigned caps, + virBitmap *caps, virDomainXMLOption *xmlopt) { g_autoptr(virDomainDef) def = NULL; diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_command.h index 7cf3e70b5e..bf9ad3beb2 100644 --- a/src/bhyve/bhyve_parse_command.h +++ b/src/bhyve/bhyve_parse_command.h @@ -21,5 +21,5 @@ #pragma once virDomainDef *bhyveParseCommandLineString(const char* nativeConfig, - unsigned caps, + virBitmap *caps, virDomainXMLOption *xmlopt); diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 41b5c118f2..c27a5cf6ed 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -225,7 +225,7 @@ bhyveSetResourceLimits(struct _bhyveConn *driver, virDomainObj *vm) return -1; } - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RCTL) == 0) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_RCTL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot set resource limits: RACCT/RCTL is either not supported or not enabled")); return -1; diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index db2789fe02..6d15035693 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -27,6 +27,7 @@ #include "virdomainobjlist.h" #include "virthread.h" #include "hypervisor/virclosecallbacks.h" +#include "virbitmap.h" #include "virportallocator.h" typedef struct _virBhyveDriverConfig virBhyveDriverConfig; @@ -69,7 +70,7 @@ struct _bhyveConn { virPortAllocatorRange *remotePorts; - unsigned bhyvecaps; + virBitmap *bhyvecaps; unsigned grubcaps; bool privileged; diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index acfaade24c..4cb5045704 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -143,7 +143,8 @@ mymain(void) DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC; + driver.bhyvecaps = virBitmapNew(BHYVE_CAP_LAST); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); DO_TEST("base"); DO_TEST("wired"); @@ -193,6 +194,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virBitmapFree(driver.bhyvecaps); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 8a6e044ad0..650563821b 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -214,13 +214,20 @@ mymain(void) DO_TEST_FULL(name, FLAG_EXPECT_PREPARE_ERROR) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \ - BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \ - BHYVE_CAP_FBUF | BHYVE_CAP_XHCI | \ - BHYVE_CAP_CPUTOPOLOGY | BHYVE_CAP_SOUND_HDA | \ - BHYVE_CAP_VNC_PASSWORD | BHYVE_CAP_VIRTIO_9P | \ - BHYVE_CAP_NVME | BHYVE_CAP_NUMA | \ - BHYVE_CAP_LPC_TPM; + driver.bhyvecaps = virBitmapNew(BHYVE_CAP_LAST); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_NET_E1000); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_LPC_BOOTROM); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_FBUF); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_XHCI); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_CPUTOPOLOGY); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_SOUND_HDA); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_VNC_PASSWORD); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_VIRTIO_9P); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_NVME); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_NUMA); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_LPC_TPM); DO_TEST("base"); DO_TEST_UNPRIVILEGED_FAILURE("base"); @@ -228,7 +235,7 @@ mymain(void) DO_TEST_FAILURE("bootorder-invalid-index"); DO_TEST("wired"); DO_TEST("acpiapic"); - driver.bhyvecaps &= ~BHYVE_CAP_ACPI; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_ACPI); DO_TEST_FAILURE("acpiapic"); DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); @@ -281,7 +288,7 @@ mymain(void) DO_TEST("numa"); DO_TEST_FAILURE("numa-empty-cpuset"); DO_TEST_FAILURE("numa-too-many-domains"); - driver.bhyvecaps &= ~BHYVE_CAP_NUMA; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NUMA); DO_TEST_FAILURE("numa"); fakefirmwaredir = g_steal_pointer(&driver.config->firmwareDir); driver.config->firmwareDir = g_steal_pointer(&fakefirmwareemptydir); @@ -291,13 +298,13 @@ mymain(void) DO_TEST_FAILURE("fs-9p-unsupported-type"); DO_TEST_FAILURE("fs-9p-unsupported-driver"); DO_TEST_FAILURE("fs-9p-unsupported-accessmode"); - driver.bhyvecaps &= ~BHYVE_CAP_VIRTIO_9P; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_VIRTIO_9P); DO_TEST_FAILURE("fs-9p"); DO_TEST("virtio-rnd"); DO_TEST_FAILURE("virtio-rnd-backend-random-non-default-file"); DO_TEST_FAILURE("virtio-rnd-backend-builtin"); DO_TEST_FAILURE("virtio-rnd-transitional"); - driver.bhyvecaps &= ~BHYVE_CAP_VIRTIO_RND; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_VIRTIO_RND); DO_TEST_FAILURE("virtio-rnd"); DO_TEST("serial-tcp"); DO_TEST("4-consoles"); @@ -338,7 +345,7 @@ mymain(void) DO_TEST_FAILURE("tpm-comma-path"); DO_TEST_FAILURE("tpm-invalid-model"); DO_TEST_FAILURE("tpm-multiple-devices"); - driver.bhyvecaps &= ~BHYVE_CAP_LPC_TPM; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_LPC_TPM); DO_TEST_FAILURE("tpm"); /* Address allocation tests */ @@ -352,7 +359,7 @@ mymain(void) DO_TEST("addr-non-isa-controller-on-slot-1"); /* The same without 32 devs per controller support */ - driver.bhyvecaps ^= BHYVE_CAP_AHCI32SLOT; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); DO_TEST("addr-no32devs-single-sata-disk"); DO_TEST("addr-no32devs-multiple-sata-disks"); DO_TEST_FAILURE("addr-no32devs-more-than-32-sata-disks"); @@ -362,33 +369,33 @@ mymain(void) DO_TEST_FAILURE("xhci-multiple-controllers"); DO_TEST_FAILURE("xhci-no-devs"); DO_TEST_FAILURE("xhci-multiple-devs"); - driver.bhyvecaps ^= BHYVE_CAP_XHCI; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_XHCI); DO_TEST_FAILURE("input-xhci-tablet"); driver.grubcaps = 0; DO_TEST("serial-grub-nocons"); - driver.bhyvecaps &= ~BHYVE_CAP_NET_E1000; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NET_E1000); DO_TEST_FAILURE("net-e1000"); - driver.bhyvecaps &= ~BHYVE_CAP_LPC_BOOTROM; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_LPC_BOOTROM); DO_TEST_FAILURE("uefi"); - driver.bhyvecaps &= ~BHYVE_CAP_FBUF; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_FBUF); DO_TEST_FAILURE("vnc"); - driver.bhyvecaps &= ~BHYVE_CAP_CPUTOPOLOGY; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_CPUTOPOLOGY); DO_TEST_FAILURE("cputopology"); - driver.bhyvecaps &= ~BHYVE_CAP_SOUND_HDA; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_SOUND_HDA); DO_TEST_FAILURE("sound"); - driver.bhyvecaps &= ~BHYVE_CAP_VNC_PASSWORD; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_VNC_PASSWORD); DO_TEST_FAILURE("vnc-password"); - driver.bhyvecaps &= ~BHYVE_CAP_NVME; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NVME); DO_TEST_FAILURE("nvme"); driver.config->bhyveloadTimeout = 300; @@ -400,9 +407,9 @@ mymain(void) virTestSetHostArch(VIR_ARCH_AARCH64); driver.caps = virBhyveCapsBuild(); /* bhyve does not support UTC clock on ARM */ - driver.bhyvecaps ^= BHYVE_CAP_RTC_UTC; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); /* bhyve does not support NUMA on ARM */ - driver.bhyvecaps &= ~BHYVE_CAP_NUMA; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NUMA); DO_TEST("base"); DO_TEST("console"); @@ -411,6 +418,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virBitmapFree(driver.bhyvecaps); virPortAllocatorRangeFree(driver.remotePorts); virObjectUnref(driver.config); diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index a9964f9825..724ba4d85f 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -95,7 +95,9 @@ mymain(void) # define DO_TEST_FAILURE(name) \ DO_TEST_FULL(name, FLAG_EXPECT_FAILURE) - driver.bhyvecaps = BHYVE_CAP_AHCI32SLOT | BHYVE_CAP_RTC_UTC; + driver.bhyvecaps = virBitmapNew(BHYVE_CAP_LAST); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); DO_TEST_DIFFERENT("acpiapic"); DO_TEST_DIFFERENT("base"); @@ -174,7 +176,7 @@ mymain(void) DO_TEST_DIFFERENT("addr-isa-controller-on-slot-31"); /* The same without 32 devs per controller support */ - driver.bhyvecaps ^= BHYVE_CAP_AHCI32SLOT; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); DO_TEST_DIFFERENT("addr-no32devs-single-sata-disk"); DO_TEST_DIFFERENT("addr-no32devs-multiple-sata-disks"); DO_TEST_FAILURE("addr-no32devs-more-than-32-sata-disks"); @@ -186,7 +188,7 @@ mymain(void) virTestSetHostArch(VIR_ARCH_AARCH64); driver.caps = virBhyveCapsBuild(); /* bhyve does not support UTC clock on ARM */ - driver.bhyvecaps ^= BHYVE_CAP_RTC_UTC; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); DO_TEST_DIFFERENT("base"); DO_TEST_DIFFERENT("console"); @@ -194,6 +196,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virBitmapFree(driver.bhyvecaps); virObjectUnref(driver.config); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index b3e9ff7051..b4ade48f91 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -147,7 +147,7 @@ fillXenCaps(virDomainCaps *domCaps) # include "bhyve/bhyve_capabilities.h" static int -fillBhyveCaps(virDomainCaps *domCaps, unsigned int *bhyve_caps) +fillBhyveCaps(virDomainCaps *domCaps, virBitmap *bhyve_caps) { g_autofree virDomainCapsStringValues *firmwares = NULL; @@ -156,7 +156,7 @@ fillBhyveCaps(virDomainCaps *domCaps, unsigned int *bhyve_caps) if (fillStringValues(firmwares, "/foo/bar", "/foo/baz", NULL) < 0) return -1; - if (virBhyveDomainCapsFill(domCaps, *bhyve_caps, firmwares) < 0) + if (virBhyveDomainCapsFill(domCaps, bhyve_caps, firmwares) < 0) return -1; return 0; @@ -420,7 +420,7 @@ mymain(void) int ret = 0; #if WITH_BHYVE - unsigned int bhyve_caps = 0; + g_autoptr(virBitmap) bhyve_caps = virBitmapNew(BHYVE_CAP_LAST); #endif #if WITH_QEMU @@ -523,16 +523,16 @@ mymain(void) #endif /* WITH_LIBXL */ #if WITH_BHYVE - DO_TEST_BHYVE("basic", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + DO_TEST_BHYVE("basic", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); - bhyve_caps |= BHYVE_CAP_LPC_BOOTROM; - DO_TEST_BHYVE("uefi", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + virBhyveCapsSet(bhyve_caps, BHYVE_CAP_LPC_BOOTROM); + DO_TEST_BHYVE("uefi", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); - bhyve_caps |= BHYVE_CAP_FBUF; - DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + virBhyveCapsSet(bhyve_caps, BHYVE_CAP_FBUF); + DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); - bhyve_caps |= BHYVE_CAP_LPC_TPM; - DO_TEST_BHYVE("tpm", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + virBhyveCapsSet(bhyve_caps, BHYVE_CAP_LPC_TPM); + DO_TEST_BHYVE("tpm", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); #endif /* WITH_BHYVE */ return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 2.55.0

2 1

[PATCH 0/4] bhyve: implement TPM support
by Roman Bogorodskiy 19 Oct '26

19 Oct '26

Roman Bogorodskiy (4): bhyve: capabilities: use consistent function names bhyve: capabilities: probe TPM support bhyve: implement TPM support bhyve: domain: validate TPM devices src/bhyve/bhyve_capabilities.c | 29 +++++++- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 27 ++++++++ src/bhyve/bhyve_domain.c | 38 +++++++++- .../x86_64/bhyvexml2argv-tpm-comma-path.xml | 16 +++++ .../x86_64/bhyvexml2argv-tpm-crb.args | 12 ++++ .../x86_64/bhyvexml2argv-tpm-crb.ldargs | 4 ++ .../x86_64/bhyvexml2argv-tpm-crb.xml | 28 ++++++++ .../bhyvexml2argv-tpm-invalid-model.xml | 16 +++++ .../bhyvexml2argv-tpm-multiple-devices.xml | 21 ++++++ .../x86_64/bhyvexml2argv-tpm.args | 12 ++++ .../x86_64/bhyvexml2argv-tpm.ldargs | 4 ++ .../x86_64/bhyvexml2argv-tpm.xml | 28 ++++++++ tests/bhyvexml2argvtest.c | 10 ++- .../x86_64/bhyvexml2xmlout-tpm.xml | 41 +++++++++++ tests/bhyvexml2xmltest.c | 4 ++ tests/domaincapsdata/bhyve_tpm.x86_64.xml | 69 +++++++++++++++++++ tests/domaincapstest.c | 3 + 18 files changed, 359 insertions(+), 4 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-comma-path.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-crb.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-crb.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-crb.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-invalid-model.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-multiple-devices.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-tpm.xml create mode 100644 tests/domaincapsdata/bhyve_tpm.x86_64.xml -- 2.55.0

2 8

[PATCH] qemu: emit UNDEFINED event when undefining source after migration
by Jim Fehlig 16 Oct '26

16 Oct '26

From: Jim Fehlig <jfehlig(a)suse.com> When migrating with VIR_MIGRATE_UNDEFINE_SOURCE, qemuMigrationSrcConfirm() and qemuMigrationSrcPerformJob() delete the domain's persistent config on the source host but never emit a VIR_DOMAIN_EVENT_UNDEFINED lifecycle event. Applications relying solely on domain events never learn the domain was undefined on the source. Emit the event, reusing the existing VIR_DOMAIN_EVENT_UNDEFINED_REMOVED detail since the semantics match virDomainUndefine(). Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/qemu/qemu_migration.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 797f83ca0d..f336437734 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4279,6 +4279,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, { qemuMigrationJobPhase phase; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + virObjectEvent *event = NULL; int ret = -1; VIR_DEBUG("vm=%p, flags=0x%x, cancelled=%d", vm, flags, cancelled); @@ -4325,11 +4326,15 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, if (!cancelled && ret == 0 && flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent = 0; + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); } qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true); } cleanup: + virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); return ret; } @@ -6328,6 +6333,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, bool v3proto) { virObjectEvent *event = NULL; + virObjectEvent *undefine_event = NULL; int ret = -1; virErrorPtr orig_err = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -6419,6 +6425,9 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent = 0; + undefine_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); } qemuDomainRemoveInactive(vm, 0, true); } @@ -6427,6 +6436,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, undefine_event); return ret; } -- 2.51.0

3 4

[PATCH v3] build: set firewall_backend_priority regardless of driver_network
by Marek Marczykowski-Górecki 16 Oct '26

16 Oct '26

Set firewall_backend_priority whenever WITH_NWFILTER or WITH_NETWORK is set. And similarly, print firewall backends on the same condition. Otherwise a build with -Ddriver_network=disabled fails with: src/nwfilter/meson.build:51:43: ERROR: Unknown variable "firewall_backend_priority". Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- meson.build | 54 +++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 927665b5fb..c15e4b43bf 100644 --- a/meson.build +++ b/meson.build @@ -1650,31 +1650,6 @@ endif if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') conf.set('WITH_NETWORK', 1) - - firewall_backend_priority = get_option('firewall_backend_priority') - if firewall_backend_priority.length() == 0 - if host_machine.system() == 'linux' - firewall_backend_priority = ['nftables', 'iptables'] - elif host_machine.system() == 'freebsd' - firewall_backend_priority = ['pf'] - else - # No firewall impl on non-Linux so far, so force 'none' - # as placeholder - firewall_backend_priority = ['none'] - endif - else - if host_machine.system() != 'linux' - error('firewall backend priority only supported on linux hosts') - endif - endif - - backends = [] - foreach backend: firewall_backend_priority - backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() - backends += backend - endforeach - - conf.set('FIREWALL_BACKENDS', ', '.join(backends)) elif get_option('driver_network').enabled() error('libvirtd must be enabled to build the network driver') endif @@ -2035,6 +2010,33 @@ if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux' conf.set('WITH_NWFILTER', 1) endif +if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK') + firewall_backend_priority = get_option('firewall_backend_priority') + if firewall_backend_priority.length() == 0 + if host_machine.system() == 'linux' + firewall_backend_priority = ['nftables', 'iptables'] + elif host_machine.system() == 'freebsd' + firewall_backend_priority = ['pf'] + else + # No firewall impl on non-Linux so far, so force 'none' + # as placeholder + firewall_backend_priority = ['none'] + endif + else + if host_machine.system() != 'linux' + error('firewall backend priority only supported on linux hosts') + endif + endif + + backends = [] + foreach backend: firewall_backend_priority + backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() + backends += backend + endforeach + + conf.set('FIREWALL_BACKENDS', ', '.join(backends)) +endif + if not get_option('pm_utils').disabled() use_pm_utils = true if init_script == 'systemd' @@ -2373,7 +2375,7 @@ misc_summary = { 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'Warning Flags': supported_cc_flags, } -if conf.has('WITH_NETWORK') +if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK') misc_summary += { 'firewall backends': firewall_backend_priority, } -- 2.54.0

2 1

[PATCH v2] build: set firewall_backend_priority regardless of driver_network
by Marek Marczykowski-Górecki 16 Oct '26

16 Oct '26

Set firewall_backend_priority whenever WITH_NWFILTER is set. And similarly, print firewall backends on the same condition. Otherwise a build with -Ddriver_network=disabled fails with: src/nwfilter/meson.build:51:43: ERROR: Unknown variable "firewall_backend_priority". Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- meson.build | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 927665b5fb..049d259555 100644 --- a/meson.build +++ b/meson.build @@ -1650,31 +1650,6 @@ endif if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') conf.set('WITH_NETWORK', 1) - - firewall_backend_priority = get_option('firewall_backend_priority') - if firewall_backend_priority.length() == 0 - if host_machine.system() == 'linux' - firewall_backend_priority = ['nftables', 'iptables'] - elif host_machine.system() == 'freebsd' - firewall_backend_priority = ['pf'] - else - # No firewall impl on non-Linux so far, so force 'none' - # as placeholder - firewall_backend_priority = ['none'] - endif - else - if host_machine.system() != 'linux' - error('firewall backend priority only supported on linux hosts') - endif - endif - - backends = [] - foreach backend: firewall_backend_priority - backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() - backends += backend - endforeach - - conf.set('FIREWALL_BACKENDS', ', '.join(backends)) elif get_option('driver_network').enabled() error('libvirtd must be enabled to build the network driver') endif @@ -2033,6 +2008,31 @@ endif # libvirt daemon is also being compiled if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux' conf.set('WITH_NWFILTER', 1) + + firewall_backend_priority = get_option('firewall_backend_priority') + if firewall_backend_priority.length() == 0 + if host_machine.system() == 'linux' + firewall_backend_priority = ['nftables', 'iptables'] + elif host_machine.system() == 'freebsd' + firewall_backend_priority = ['pf'] + else + # No firewall impl on non-Linux so far, so force 'none' + # as placeholder + firewall_backend_priority = ['none'] + endif + else + if host_machine.system() != 'linux' + error('firewall backend priority only supported on linux hosts') + endif + endif + + backends = [] + foreach backend: firewall_backend_priority + backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() + backends += backend + endforeach + + conf.set('FIREWALL_BACKENDS', ', '.join(backends)) endif if not get_option('pm_utils').disabled() @@ -2373,7 +2373,7 @@ misc_summary = { 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'Warning Flags': supported_cc_flags, } -if conf.has('WITH_NETWORK') +if conf.has('WITH_NWFILTER') misc_summary += { 'firewall backends': firewall_backend_priority, } -- 2.54.0

2 1

[PATCH v2 0/2] qemu: add support for vhost-net when using the mshv accelerator
by Magnus Kulke 16 Oct '26

16 Oct '26

Currently vhost-net is dropped for everything but KVM, this change enables it also for the MSHV accelerator (HYPERV). Changes since v1: - The dedicated unit test has been dropped - Test fixtures and mock have been extended to test a vhost net device Magnus Kulke (2): tests: Add vhost network interface to mshv config qemu: Consider vhost-net for mshv accelerator src/qemu/qemu_interface.c | 6 +++--- tests/qemuxml2argvmock.c | 3 ++- ...86_64-q35-headless.x86_64-latest+mshv.args | 11 +++++++---- ...x86_64-q35-headless.x86_64-latest+mshv.xml | 19 +++++++++++++++---- .../mshv-x86_64-q35-headless.xml | 5 +++++ 5 files changed, 32 insertions(+), 12 deletions(-) -- 2.34.1

2 4