- Devel - libvirt List Archives

[PATCH 00/36] qemu: Improvements and fixes to firmware selection
by Andrea Bolognani 06 Jan '26

06 Jan '26

This series improves validation so that more nonsensical configurations are rejected, fixes a number of scenarios in which user-provided attributes were getting overwritten by the firmware selection process, and overall makes things more predictable and reliable. Notably, it addresses the inability of starting confidential VMs on aarch64, which was reported[1] some time ago. It is also a prerequisite of another series that I will post shortly, which introduces support for the uefi-vars QEMU device and thus makes it possible to use Secure Boot for aarch64 VMs. Since all these fixes and improvements make sense on their own, and there is a little bit of work still needed on the QEMU/edk2 side before the other series can be merged, I decided to post this one separately instead of lumping them together. It's not like it's not meaty enough on its own anyway :) [1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/D5UD… Andrea Bolognani (36): qemu_firmware: Drop support for kernel descriptors qemu_firmware: Drop 'nvram' local variable qemu_firmware: Move format=raw compat exception qemu_firmware: Move copying of nvram.format to loader.format tests: Add firmware-manual-efi-rw-nvram domain_validate: Reject NVRAM with read/write firmware tests: Add firmware-auto-bios-rw tests: Add firmware-manual-bios-rw domain_validate: Reject read/write ROMs tests: Add firmware-auto-efi-format-loader-qcow2-rom domain_validate: Reject ROMs with format other than raw qemu_firmware: Ignore stateless/combined when NVRAM is configured qemu_firmware: Drop fallback for absent nvramTemplateFormat schemas: Allow templateFormat without template path tests: Add firmware-manual-efi-nvram-template-nonstandard-format tests: Add firmware-manual-efi-nvram-template-nonstandard-legacy-paths tests: Add firmware-auto-efi-format-nvram-raw tests: Add firmware-auto-efi-format-nvram-raw-loader-path tests: Add firmware-auto-efi-format-nvram-raw-nvramtemplate-path tests: Add firmware-auto-efi-format-nvramtemplate-qcow2 tests: Add firmware-auto-efi-format-mismatch-nvramtemplate qemu_firmware: Introduce qemuFirmwareFillDomainCustom() qemu_firmware: Set templateFormat for custom paths qemu_firmware: Simplify handling of legacy paths qemu_firmware: Refactor setting NVRAM format qemu_firmware: Prefer template format to loader format qemu_firmware: Retain user-specified NVRAM format qemu_firmware: Take templateFormat into account when matching qemu_firmware: Take NVRAM format into account when matching qemu_firmware: Remove NVRAM to loader format copy hack tests: Add firmware-manual-efi-sev-snp tests: Add firmware-manual-efi-tdx qemu_firmware: ROM firmware is always in raw format qemu_firmware: Don't skip autoselection for ROM qemu_firmware: Allow matching both UEFI and BIOS for ROM loader news: Mention improvements and fixes to firmware selection NEWS.rst | 8 + src/conf/domain_conf.c | 18 +- src/conf/domain_validate.c | 30 ++ src/conf/schemas/domaincommon.rng | 10 +- src/qemu/qemu_firmware.c | 367 ++++++++++-------- src/qemu/qemu_postparse.c | 17 - .../firmware-auto-bios-rw.x86_64-latest.err | 1 + ...> firmware-auto-bios-rw.x86_64-latest.xml} | 5 +- .../qemuxmlconfdata/firmware-auto-bios-rw.xml | 18 + ...-format-loader-qcow2-rom.x86_64-latest.err | 1 + ...mware-auto-efi-format-loader-qcow2-rom.xml | 18 + ...t-mismatch-nvramtemplate.x86_64-latest.err | 1 + ...-mismatch-nvramtemplate.x86_64-latest.xml} | 6 +- ...auto-efi-format-mismatch-nvramtemplate.xml | 19 + ...uto-efi-format-mismatch.x86_64-latest.args | 5 +- ...auto-efi-format-mismatch.x86_64-latest.xml | 2 +- ...-nvram-raw-loader-path.x86_64-latest.args} | 4 +- ...t-nvram-raw-loader-path.x86_64-latest.xml} | 4 +- ...-auto-efi-format-nvram-raw-loader-path.xml | 19 + ...raw-nvramtemplate-path.x86_64-latest.args} | 4 +- ...-raw-nvramtemplate-path.x86_64-latest.xml} | 4 +- ...fi-format-nvram-raw-nvramtemplate-path.xml | 18 + ...t-nvram-raw.x86_64-latest.abi-update.args} | 0 ...at-nvram-raw.x86_64-latest.abi-update.xml} | 0 ...o-efi-format-nvram-raw.x86_64-latest.args} | 0 ...to-efi-format-nvram-raw.x86_64-latest.xml} | 0 .../firmware-auto-efi-format-nvram-raw.xml | 18 + ...at-nvramtemplate-qcow2.x86_64-latest.args} | 9 +- ...mat-nvramtemplate-qcow2.x86_64-latest.xml} | 4 +- ...re-auto-efi-format-nvramtemplate-qcow2.xml | 18 + .../firmware-manual-bios-rw.x86_64-latest.err | 1 + .../firmware-manual-bios-rw.xml | 15 + ...-loader-path-nonstandard.x86_64-latest.xml | 2 +- ...ate-nonstandard-format.x86_64-latest.args} | 10 +- ...late-nonstandard-format.x86_64-latest.xml} | 4 +- ...-efi-nvram-template-nonstandard-format.xml | 19 + ...nstandard-legacy-paths.x86_64-latest.args} | 4 +- ...onstandard-legacy-paths.x86_64-latest.xml} | 5 +- ...vram-template-nonstandard-legacy-paths.xml | 20 + ...ram-template-nonstandard.x86_64-latest.xml | 2 +- ...ware-manual-efi-rw-nvram.x86_64-latest.err | 1 + .../firmware-manual-efi-rw-nvram.xml | 19 + ...ual-efi-sev-snp.x86_64-latest+amdsev.args} | 7 +- ...nual-efi-sev-snp.x86_64-latest+amdsev.xml} | 12 +- .../firmware-manual-efi-sev-snp.xml | 21 + ...anual-efi-tdx.x86_64-latest+inteltdx.args} | 9 +- ...manual-efi-tdx.x86_64-latest+inteltdx.xml} | 11 +- .../firmware-manual-efi-tdx.xml | 25 ++ tests/qemuxmlconftest.c | 19 + 49 files changed, 571 insertions(+), 263 deletions(-) create mode 100644 tests/qemuxmlconfdata/firmware-auto-bios-rw.x86_64-latest.err copy tests/qemuxmlconfdata/{firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml => firmware-auto-bios-rw.x86_64-latest.xml} (83%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-bios-rw.xml create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-rom.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-rom.xml create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch-nvramtemplate.x86_64-latest.err copy tests/qemuxmlconfdata/{firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml => firmware-auto-efi-format-mismatch-nvramtemplate.x86_64-latest.xml} (83%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch-nvramtemplate.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-auto-efi-format-nvram-raw-loader-path.x86_64-latest.args} (90%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.xml => firmware-auto-efi-format-nvram-raw-loader-path.x86_64-latest.xml} (81%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-auto-efi-format-nvram-raw-nvramtemplate-path.x86_64-latest.args} (90%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.xml => firmware-auto-efi-format-nvram-raw-nvramtemplate-path.x86_64-latest.xml} (81%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplate-path.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-auto-efi-format-nvram-raw.x86_64-latest.abi-update.args} (100%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.xml => firmware-auto-efi-format-nvram-raw.x86_64-latest.abi-update.xml} (100%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-auto-efi-format-nvram-raw.x86_64-latest.args} (100%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.xml => firmware-auto-efi-format-nvram-raw.x86_64-latest.xml} (100%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-auto-efi-format-nvramtemplate-qcow2.x86_64-latest.args} (77%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.xml => firmware-auto-efi-format-nvramtemplate-qcow2.x86_64-latest.xml} (81%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.xml create mode 100644 tests/qemuxmlconfdata/firmware-manual-bios-rw.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/firmware-manual-bios-rw.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-manual-efi-nvram-template-nonstandard-format.x86_64-latest.args} (70%) copy tests/qemuxmlconfdata/{firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml => firmware-manual-efi-nvram-template-nonstandard-format.x86_64-latest.xml} (81%) create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-format.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-manual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.args} (89%) copy tests/qemuxmlconfdata/{firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml => firmware-manual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.xml} (81%) create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-legacy-paths.xml create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-manual-efi-sev-snp.x86_64-latest+amdsev.args} (74%) copy tests/qemuxmlconfdata/{firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml => firmware-manual-efi-sev-snp.x86_64-latest+amdsev.xml} (75%) create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.xml copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.args => firmware-manual-efi-tdx.x86_64-latest+inteltdx.args} (59%) copy tests/qemuxmlconfdata/{firmware-auto-efi-format-mismatch.x86_64-latest.xml => firmware-manual-efi-tdx.x86_64-latest+inteltdx.xml} (69%) create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-tdx.xml -- 2.52.0

3 38

[PATCH] tools: check for failure decoding secret base64 value
by Daniel P. Berrangé 06 Jan '26

06 Jan '26

From: Daniel P. Berrangé <berrange(a)redhat.com> The g_base64_decode function will return a valid pointer, but with length of zero when it fails to decode data. Report an error in that scenario, so avoid a later more obsecure error. eg old behaviour # virsh secret-set-value f52a81b2-424e-490c-823d-6bd4235bc507 foo warning: Passing secret value as command-line argument is insecure! error: Failed to set secret value error: value in virSecretSetValue must not be NULL new behaviour # /home/berrange/virsh secret-set-value f52a81b2-424e-490c-823d-6bd4235bc507 foo warning: Passing secret value as command-line argument is insecure! error: Secret value is not valid base64 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/virsh-secret.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 26ecb41073..215e8e1017 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -267,6 +267,11 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) secret_val = (char *) g_base64_decode(tmp, &secret_len); virSecureErase(tmp, tmp_len); + + if (!secret_len) { + vshError(ctl, "%s", _("Secret value is not valid base64")); + return false; + } } res = virSecretSetValue(secret, (unsigned char *) secret_val, secret_len, 0); -- 2.52.0

2 1

[PATCH v2 0/5] cover: RFE libvirt secret encryption on disk
by Arun Menon 06 Jan '26

06 Jan '26

Libvirt secrets are stored unencrypted on the disk. With this series we want to start encrypting the secrets. 1. Introduce the GnuTLS decryption wrapper functions that work exact opposite to the encryption wrappers. 2. Add a new service called virt-secrets-init-encryption, that is linked to the virtsecretd and libvirtd service. virtsecretd and libvirtd services only starts after the new service generates a random encryption key. 3. Add a new secret.conf configuration file that helps user to set a. secrets_encryption_key - allows the user to specify the encryption key file path, in case the default key is not to be used. b. encrypt_data - set to 0 or 1. If set to 1, then the newly added secrets will be encrypted. 4. Rename the file name attribute in virSecretObj structure to secretValueFile. 5. Once we have the encryption key, and a reliable way to tell the daemon what encryption scheme the secret object is using, we can encrypt the secrets on disk and store them in <uuid>.<encryption_scheme> format. It is important to note that if the encryption key is changed between restarts, then the respective secret will not be loaded by the driver. This is a sincere attempt to improve upon the already submitted patch https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/KE6G… Resolves: https://issues.redhat.com/browse/RHEL-7125 --- Changes in v2: - Fixed a regression in the decryption logic. ciphertext length was incorrectly calculated. - Removed virSecretEncryptionScheme enum. It is no longer required. All the changes will be done at one place i.e. schemeInfo array. In future we can append to the array, when we want to add new cipher modes. - Add Requires= and After= directives in libvirtd service. Remove unnecessary configuration settings from src/secret meson.build. - Other minor refactoring and header include fix. Arun Menon (5): util: Add support for GnuTLS decryption secret: Set up default encryption secret key for the virtsecretd service secret: Add secret.conf configuration file and parse it secret: Rename virSecretObj structure attribute from base64File to secretValueFile secret: Add functionality to load and save secrets in encrypted format include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + po/POTFILES | 1 + src/conf/virsecretobj.c | 183 ++++++++++++++---- src/conf/virsecretobj.h | 18 +- src/libvirt_private.syms | 1 + src/meson.build | 1 + src/remote/libvirtd.service.in | 4 + src/secret/libvirt_secrets.aug | 40 ++++ src/secret/meson.build | 31 +++ src/secret/secret.conf.in | 14 ++ src/secret/secret_config.c | 179 +++++++++++++++++ src/secret/secret_config.h | 40 ++++ src/secret/secret_driver.c | 34 +++- src/secret/test_libvirt_secrets.aug.in | 6 + .../virt-secret-init-encryption.service.in | 8 + src/secret/virtsecretd.service.extra.in | 8 + src/util/vircrypto.c | 126 +++++++++++- src/util/vircrypto.h | 8 + src/util/virerror.c | 3 + tests/vircryptotest.c | 65 +++++++ 21 files changed, 728 insertions(+), 50 deletions(-) create mode 100644 src/secret/libvirt_secrets.aug create mode 100644 src/secret/secret.conf.in create mode 100644 src/secret/secret_config.c create mode 100644 src/secret/secret_config.h create mode 100644 src/secret/test_libvirt_secrets.aug.in create mode 100644 src/secret/virt-secret-init-encryption.service.in -- 2.51.1

2 8

[RFC 00/10] qom: Support marking object properties as deprecated
by Zhao Liu 06 Jan '26

06 Jan '26

Hi, This RFC is the follow-up work of v2.6 & v2.7 machines' removal [*], and tries to introduce a general way to provide deprecation hint for external user. Its core idea is to detect external property settings (as well as specific internal property settings, such as the compat property). I think deprecated properties and internal-only properties are quite similar, as both require consideration of external property usage. But the former only triggers a warning, while the latter stops all external access attempts. For simplicity, this RFC series only considers deprecated properties. Brief Introduction ================== Now the common (but a bit fragmented) way to mark a property deprecated is to add the warning in its accssors, or just document the deprecation in docs/about/deprecated.rst without any hint when someone touches that property. Ideally, it's better to provide some hints to external user when he tries to set the property via command line or HMP. But this is pretty inconvenient (even impossible) for such qdev properties, which are defined via DEFINE_PROP_* macros in the Property array. For qdev properties, their accessors are provided by pre-defined PropertyInfo, so that it's possible to modify PropertyInfo for a single "deprecated" property. Then it's necessary to introduce property flags to mark some properties as deprecated, and to check the property flags when set the property, thereby to print a deprecation warning. This not only benefits traditional qdev properties but also helps the deprecation of generic objects. Note, internal attempt (except the compat case) should not trigger the deprecation warning but external user should see the deprecation information. I think the most complex part is identifying the paths for property settings (both external command-line options and internal specific configurations). This series currently covers the following scenarios (which I consider to be particularly important): External cases: 1) External global properties: * -global command line option. * -cpu command line features. * suger properties from object_compat_props[2] 2) External ("TYPE_USER_CREATABLE") object: * -object command line used for external ("TYPE_USER_CREATABLE") object. 3) External device: * -device command line - parsed based on keyval or json. 4) External machine options: * -machine command line - parsed based on keyval. 5) External accelerator options: * -accel command line. 6) HMP command: * "qom-set" command. Internal cases: 1) internal global properties: * compat properties from object_compat_props[0,1]. 2) Internal machine options: * Builtin default machine options string: MachineClass::default_machine_opts - parsed based on keyval, too. In fact, there are still some special device command lines that haven't been considered yet. But I believe the remaining cases can be gradually expanded? If this approach is feasible, it's possible to further introduce an "internal" flag to prevent external access to compat property. [*]: hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines https://lore.kernel.org/qemu-devel/20251202162835.3227894-1-zhao1.liu@intel… Thanks and Best Regards, Zhao --- Zhao Liu (10): qom: Rename ObjectPropertyFlags to ObjectPropertyAccessorFlags qom: Add basic object property deprecation hint support qom: Check property deprecation flag for global property qom: Check property deprecation flag for properities from qdict system/vl: Check property deprecation flag for properities of accelerator qom/qom-hmp-cmd: Check property deprecation flag for "qom-set" command hw/core/qdev-properties: Allow to mark qdev property as deprecated target/i386: Deprecate fill-mtrr-mask property target/i386: Deprecate cpuid-0xb property hw/intc/ioapic: Deprecate version property docs/about/deprecated.rst | 31 +++++++++ hw/core/qdev-properties.c | 24 +++---- hw/intc/ioapic.c | 3 +- include/hw/qdev-properties.h | 18 ++++++ include/qom/object.h | 120 +++++++++++++++++++++++++++++++---- qom/object.c | 101 ++++++++++++++++++++++------- qom/object_interfaces.c | 2 +- qom/qom-hmp-cmds.c | 2 +- system/vl.c | 2 +- target/i386/cpu.c | 4 +- 10 files changed, 253 insertions(+), 54 deletions(-) -- 2.34.1

2 18

[PATCH v3 0/7] qemu: Implement support for iommufd
by Nathan Chen 05 Jan '26

05 Jan '26

From: Nathan Chen <nathanc(a)nvidia.com> Hi, This is a follow up to the second patch series [0] for using iommufd to propagate DMA mappings to the kernel for VM-assigned host devices in a qemu VM. We add a new 'iommufd' attribute for hostdev devices to be associated with the iommufd object. For instance, specifying the iommufd object and associated hostdev in a VM definition: <devices> ... <hostdev mode='subsystem' type='pci' managed='no'> <driver iommufd='yes'/> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x15' slot='0x00' function='0x0'/> </hostdev> <hostdev mode='subsystem' type='pci' managed='no'> <driver iommufd='yes'/> <source> <address domain='0x0019' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x16' slot='0x00' function='0x0'/> </hostdev> ... </devices> This would get translated to a qemu command line with the arguments below. Note that libvirt will open the /dev/iommu and VFIO cdev, passing the associated fd number to qemu: -object '{"qom-type":"iommufd","id":"iommufd0","fd":"24"}' \ -device '{"driver":"vfio-pci","host":"0009:01:00.0","id":"hostdev0","iommufd":"iommufd0","fd":"22","bus":"pci.21","addr":"0x0"}' \ -device '{"driver":"vfio-pci","host":"0019:01:00.0","id":"hostdev1","iommufd":"iommufd0","fd":"25","bus":"pci.22","addr":"0x0"}' \ Changes from v2: - Set per-process memory accounting mode for iommufd - Separated out formatting of iommufd object from qemuBuildHostdevCommandLine - Placed hostdev private data implementation in a separate commit - Allocate hostdev private data unconditionally - Compare FDs against -1 - Integrated callback function in virQEMUDriverPrivateDataCallbacks for qemuDomainHostdevPrivateNew - Dropped qemuProcessCloseVfioFds - Addressed other feedback from v2 (formatting, includes, etc.) - Revised seclabel logic to be device-specific for AppArmor and to allow paths for SELinux/DAC Thanks to Ján Tomko for sharing some of the above changes in a personal repo. I have included changes directly from that repo and added Suggested-by or Signed-off-by tags on various commits containing the changes. This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/tree/iommufd-12-25 Thanks, Nathan [0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/KFYU… Signed-off-by: Nathan Chen <nathanc(a)nvidia.com> Nathan Chen (7): qemu: Implement support for associating iommufd to hostdev qemu: Introduce privateData for hostdevs qemu: open VFIO FDs from libvirt backend qemu: open iommufd FD from libvirt backend qemu: Set per-process memory accounting for iommufd qemu: Update Cgroup, namespace, and seclabel for iommufd tests: qemuxmlconfdata: provide iommufd sample XML and CLI args cover letter: qemu: Implement support for iommufd docs/formatdomain.rst | 7 + po/POTFILES | 1 + src/bhyve/bhyve_parse_command.c | 2 +- src/conf/device_conf.c | 11 ++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 13 +- src/conf/domain_conf.h | 5 +- src/conf/schemas/basictypes.rng | 5 + src/libvirt_private.syms | 4 + src/libxl/xen_common.c | 2 +- src/libxl/xen_xl.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_cgroup.c | 26 ++-- src/qemu/qemu_command.c | 74 ++++++++++ src/qemu/qemu_domain.c | 41 ++++++ src/qemu/qemu_domain.h | 20 +++ src/qemu/qemu_namespace.c | 16 ++- src/qemu/qemu_process.c | 126 ++++++++++++++++++ src/security/security_apparmor.c | 33 ++++- src/security/security_dac.c | 60 +++++++-- src/security/security_selinux.c | 58 ++++++-- src/security/virt-aa-helper.c | 32 ++++- src/util/meson.build | 1 + src/util/viriommufd.c | 89 +++++++++++++ src/util/viriommufd.h | 23 ++++ src/util/virpci.c | 69 ++++++++++ src/util/virpci.h | 2 + src/vbox/vbox_common.c | 2 +- .../iommufd-q35.x86_64-latest.args | 41 ++++++ .../iommufd-q35.x86_64-latest.xml | 60 +++++++++ tests/qemuxmlconfdata/iommufd-q35.xml | 38 ++++++ .../iommufd-virt.aarch64-latest.args | 33 +++++ .../iommufd-virt.aarch64-latest.xml | 34 +++++ tests/qemuxmlconfdata/iommufd-virt.xml | 22 +++ .../iommufd.x86_64-latest.args | 35 +++++ .../qemuxmlconfdata/iommufd.x86_64-latest.xml | 38 ++++++ tests/qemuxmlconfdata/iommufd.xml | 30 +++++ tests/qemuxmlconftest.c | 33 +++++ tests/virhostdevtest.c | 2 +- 39 files changed, 1031 insertions(+), 62 deletions(-) create mode 100644 src/util/viriommufd.c create mode 100644 src/util/viriommufd.h create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-q35.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt.xml create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd.xml -- 2.43.0

3 19

[PATCH 0/3] bhyve: add virtio-scsi support
by Roman Bogorodskiy 05 Jan '26

05 Jan '26

Roman Bogorodskiy (3): conf: introduce CTL storage type bhyve: add virtio-scsi support docs: bhyve: document virtio-scsi support docs/drvbhyve.rst | 19 +++++ docs/formatdomain.rst | 5 ++ src/bhyve/bhyve_command.c | 73 ++++++++++++++++++- src/bhyve/bhyve_device.c | 1 + src/bhyve/bhyve_process.c | 1 + src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 7 ++ src/conf/schemas/domaincommon.rng | 13 ++++ src/conf/storage_source_conf.c | 6 +- src/conf/storage_source_conf.h | 1 + src/libxl/xen_xl.c | 1 + src/qemu/qemu_block.c | 2 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_migration.c | 3 + src/qemu/qemu_process.c | 1 + src/qemu/qemu_snapshot.c | 4 + src/qemu/qemu_validate.c | 1 + src/storage_file/storage_source.c | 1 + .../bhyvexml2argv-virtio-scsi.args | 10 +++ .../bhyvexml2argv-virtio-scsi.ldargs | 4 + .../bhyvexml2argv-virtio-scsi.xml | 21 ++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-virtio-scsi.xml | 32 ++++++++ tests/bhyvexml2xmltest.c | 1 + 24 files changed, 205 insertions(+), 5 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.xml -- 2.52.0

2 6

[PATCH 0/9] bhyve: arm64 guest support
by Roman Bogorodskiy 05 Jan '26

05 Jan '26

This series includes a minimal number of changes to allow running bhyve arm64 guests. Bhyve on amd64 and arm64 has slightly different sets of supported devices, and a different syntax for some devices. Specifically, bootrom and consoles are configured without the LPC controller, used for amd64, but using the "-o" argument, i.e. "-o bootrom=<bootrom>" and "-o console=<console>". This series moves quite a significant amount of test data files. I tried to isolate that into separate commit with a minimal set of related changes. While this series enables running arm64, there are more items to work on: - On arm64, bhyve normally uses /usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin bootrom. Autofill code should be updated to automatically use that if no path was specified. - Bhyve capabilities probing uses `bhyve -s 0,<device>` and parsing error message to see if a device is supported. Using `bhyve -s help` that lists supported devices should be more accurate and robust. - UTC clock is not supported on bhyve/arm64. I wasn't able to figure out yet how to make libvirt not using it by default, so currently arm64 guests require <clock offset='localtime'/> I plan to address these issues in a separate series. Roman Bogorodskiy (9): bhyve: capabilities: fix for arm64 bhyve: tests: support arch-dependent tests bhyve: domain: require ISA controller on x86_64 only bhyve: command: handle arm64 console bhyve: command: make -H and -P args amd64-only bhyve: command: handle arm64 bootloader bhyve: tests: prepare for arm64 xml2xml tests bhyve: tests: add xml2xml arm64 tests bhyve: report domain capabilities for arm64 src/bhyve/bhyve_capabilities.c | 5 +- src/bhyve/bhyve_command.c | 92 ++++++++++++------- src/bhyve/bhyve_domain.c | 3 + src/bhyve/bhyve_driver.c | 2 +- src/bhyve/bhyve_firmware.c | 3 + .../aarch64/bhyvexml2argv-base.args | 8 ++ .../bhyvexml2argv-base.ldargs} | 0 .../aarch64/bhyvexml2argv-base.xml | 23 +++++ .../aarch64/bhyvexml2argv-bootloader.args | 9 ++ .../bhyvexml2argv-bootloader.ldargs} | 0 .../aarch64/bhyvexml2argv-bootloader.xml | 24 +++++ .../aarch64/bhyvexml2argv-console.args | 9 ++ .../aarch64/bhyvexml2argv-console.ldargs | 7 ++ .../aarch64/bhyvexml2argv-console.xml | 26 ++++++ .../bhyvexml2argv-2-nvme-2-controllers.args | 0 .../bhyvexml2argv-2-nvme-2-controllers.ldargs | 0 .../bhyvexml2argv-2-nvme-2-controllers.xml | 0 .../bhyvexml2argv-2-nvme-same-controller.args | 0 ...hyvexml2argv-2-nvme-same-controller.ldargs | 0 .../bhyvexml2argv-2-nvme-same-controller.xml | 0 .../bhyvexml2argv-4-consoles.args | 0 .../bhyvexml2argv-4-consoles.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-4-consoles.xml | 0 .../{ => x86_64}/bhyvexml2argv-acpiapic.args | 0 .../bhyvexml2argv-acpiapic.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-acpiapic.xml | 0 ...ml2argv-addr-isa-controller-on-slot-1.args | 0 ...2argv-addr-isa-controller-on-slot-1.ldargs | 0 ...xml2argv-addr-isa-controller-on-slot-1.xml | 0 ...l2argv-addr-isa-controller-on-slot-31.args | 0 ...argv-addr-isa-controller-on-slot-31.ldargs | 0 ...ml2argv-addr-isa-controller-on-slot-31.xml | 0 ...xml2argv-addr-more-than-32-sata-disks.args | 0 ...l2argv-addr-more-than-32-sata-disks.ldargs | 0 ...exml2argv-addr-more-than-32-sata-disks.xml | 0 ...hyvexml2argv-addr-multiple-sata-disks.args | 0 ...vexml2argv-addr-multiple-sata-disks.ldargs | 0 ...bhyvexml2argv-addr-multiple-sata-disks.xml | 0 ...vexml2argv-addr-multiple-virtio-disks.args | 0 ...xml2argv-addr-multiple-virtio-disks.ldargs | 0 ...yvexml2argv-addr-multiple-virtio-disks.xml | 0 ...-addr-no32devs-more-than-32-sata-disks.xml | 0 ...rgv-addr-no32devs-multiple-sata-disks.args | 0 ...v-addr-no32devs-multiple-sata-disks.ldargs | 0 ...argv-addr-no32devs-multiple-sata-disks.xml | 0 ...l2argv-addr-no32devs-single-sata-disk.args | 0 ...argv-addr-no32devs-single-sata-disk.ldargs | 0 ...ml2argv-addr-no32devs-single-sata-disk.xml | 0 ...rgv-addr-non-isa-controller-on-slot-1.args | 0 ...-addr-non-isa-controller-on-slot-1.ldargs} | 0 ...argv-addr-non-isa-controller-on-slot-1.xml | 0 .../bhyvexml2argv-addr-single-sata-disk.args | 0 ...bhyvexml2argv-addr-single-sata-disk.ldargs | 0 .../bhyvexml2argv-addr-single-sata-disk.xml | 0 ...bhyvexml2argv-addr-single-virtio-disk.args | 0 ...yvexml2argv-addr-single-virtio-disk.ldargs | 0 .../bhyvexml2argv-addr-single-virtio-disk.xml | 0 .../{ => x86_64}/bhyvexml2argv-base.args | 0 .../{ => x86_64}/bhyvexml2argv-base.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-base.xml | 0 .../bhyvexml2argv-bhyveload-bootorder.args | 0 .../bhyvexml2argv-bhyveload-bootorder.ldargs | 0 .../bhyvexml2argv-bhyveload-bootorder.xml | 0 .../bhyvexml2argv-bhyveload-bootorder1.args | 0 .../bhyvexml2argv-bhyveload-bootorder1.ldargs | 0 .../bhyvexml2argv-bhyveload-bootorder1.xml | 0 .../bhyvexml2argv-bhyveload-bootorder2.xml | 0 .../bhyvexml2argv-bhyveload-bootorder3.args | 0 .../bhyvexml2argv-bhyveload-bootorder3.ldargs | 0 .../bhyvexml2argv-bhyveload-bootorder3.xml | 0 .../bhyvexml2argv-bhyveload-bootorder4.xml | 0 .../bhyvexml2argv-bhyveload-bootorder5.xml | 0 .../bhyvexml2argv-bhyveload-explicitargs.args | 0 ...hyvexml2argv-bhyveload-explicitargs.ldargs | 0 .../bhyvexml2argv-bhyveload-explicitargs.xml | 0 .../bhyvexml2argv-bhyveload-timeout.args | 0 .../bhyvexml2argv-bhyveload-timeout.ldargs | 7 ++ .../bhyvexml2argv-bhyveload-timeout.xml | 0 .../bhyvexml2argv-commandline.args | 0 .../bhyvexml2argv-commandline.ldargs | 0 .../bhyvexml2argv-commandline.xml | 0 ...gv-console-master-slave-not-specified.args | 0 ...-console-master-slave-not-specified.ldargs | 0 ...rgv-console-master-slave-not-specified.xml | 0 .../{ => x86_64}/bhyvexml2argv-console.args | 0 .../{ => x86_64}/bhyvexml2argv-console.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-console.xml | 0 ...yvexml2argv-cputopology-nvcpu-mismatch.xml | 0 .../bhyvexml2argv-cputopology.args | 0 .../bhyvexml2argv-cputopology.ldargs | 0 .../bhyvexml2argv-cputopology.xml | 0 .../bhyvexml2argv-custom-loader.args | 0 .../bhyvexml2argv-custom-loader.ldargs | 0 .../bhyvexml2argv-custom-loader.xml | 0 .../bhyvexml2argv-disk-cdrom-grub.args | 0 .../bhyvexml2argv-disk-cdrom-grub.devmap | 0 .../bhyvexml2argv-disk-cdrom-grub.ldargs | 0 .../bhyvexml2argv-disk-cdrom-grub.xml | 0 .../bhyvexml2argv-disk-cdrom.args | 0 .../bhyvexml2argv-disk-cdrom.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-disk-cdrom.xml | 0 .../bhyvexml2argv-disk-virtio-queue-opts.xml | 0 ...hyvexml2argv-disk-virtio-rotation-rate.xml | 0 .../bhyvexml2argv-disk-virtio.args | 0 .../bhyvexml2argv-disk-virtio.ldargs | 0 .../bhyvexml2argv-disk-virtio.xml | 0 .../bhyvexml2argv-firmware-efi.args | 0 .../bhyvexml2argv-firmware-efi.ldargs} | 0 .../bhyvexml2argv-firmware-efi.xml | 0 .../bhyvexml2argv-fs-9p-readonly.args | 0 .../bhyvexml2argv-fs-9p-readonly.ldargs | 0 .../bhyvexml2argv-fs-9p-readonly.xml | 0 ...exml2argv-fs-9p-unsupported-accessmode.xml | 0 ...bhyvexml2argv-fs-9p-unsupported-driver.xml | 0 .../bhyvexml2argv-fs-9p-unsupported-type.xml | 0 .../{ => x86_64}/bhyvexml2argv-fs-9p.args | 0 .../{ => x86_64}/bhyvexml2argv-fs-9p.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-fs-9p.xml | 0 .../bhyvexml2argv-grub-bootorder.args | 0 .../bhyvexml2argv-grub-bootorder.devmap | 0 .../bhyvexml2argv-grub-bootorder.ldargs | 0 .../bhyvexml2argv-grub-bootorder.xml | 0 .../bhyvexml2argv-grub-bootorder2.args | 0 .../bhyvexml2argv-grub-bootorder2.devmap | 0 .../bhyvexml2argv-grub-bootorder2.ldargs | 0 .../bhyvexml2argv-grub-bootorder2.xml | 0 .../bhyvexml2argv-grub-defaults.args | 0 .../bhyvexml2argv-grub-defaults.devmap | 0 .../bhyvexml2argv-grub-defaults.ldargs | 0 .../bhyvexml2argv-grub-defaults.xml | 0 .../bhyvexml2argv-input-xhci-tablet.args | 0 .../bhyvexml2argv-input-xhci-tablet.ldargs | 0 .../bhyvexml2argv-input-xhci-tablet.xml | 0 .../bhyvexml2argv-isa-controller.args | 0 .../bhyvexml2argv-isa-controller.ldargs | 0 .../bhyvexml2argv-isa-controller.xml | 0 ...bhyvexml2argv-isa-multiple-controllers.xml | 0 .../{ => x86_64}/bhyvexml2argv-localtime.args | 0 .../bhyvexml2argv-localtime.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-localtime.xml | 0 .../{ => x86_64}/bhyvexml2argv-macaddr.args | 0 .../{ => x86_64}/bhyvexml2argv-macaddr.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-macaddr.xml | 0 .../{ => x86_64}/bhyvexml2argv-metadata.xml | 0 .../{ => x86_64}/bhyvexml2argv-msrs.args | 0 .../{ => x86_64}/bhyvexml2argv-msrs.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-msrs.xml | 0 .../{ => x86_64}/bhyvexml2argv-net-e1000.args | 0 .../bhyvexml2argv-net-e1000.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-net-e1000.xml | 0 .../{ => x86_64}/bhyvexml2argv-nvme.args | 0 .../{ => x86_64}/bhyvexml2argv-nvme.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-nvme.xml | 0 .../bhyvexml2argv-passthru-multiple-devs.args | 0 ...hyvexml2argv-passthru-multiple-devs.ldargs | 0 .../bhyvexml2argv-passthru-multiple-devs.xml | 0 .../{ => x86_64}/bhyvexml2argv-passthru.args | 0 .../bhyvexml2argv-passthru.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-passthru.xml | 0 .../bhyvexml2argv-sata-rotation-rate.args | 0 .../bhyvexml2argv-sata-rotation-rate.ldargs | 0 .../bhyvexml2argv-sata-rotation-rate.xml | 0 .../bhyvexml2argv-serial-grub-nocons.args | 0 .../bhyvexml2argv-serial-grub-nocons.devmap | 0 .../bhyvexml2argv-serial-grub-nocons.ldargs | 0 .../bhyvexml2argv-serial-grub-nocons.xml | 0 .../bhyvexml2argv-serial-grub.args | 0 .../bhyvexml2argv-serial-grub.devmap | 0 .../bhyvexml2argv-serial-grub.ldargs | 0 .../bhyvexml2argv-serial-grub.xml | 0 .../bhyvexml2argv-serial-invalid-port.args | 0 .../bhyvexml2argv-serial-invalid-port.ldargs | 0 .../bhyvexml2argv-serial-invalid-port.xml | 0 .../bhyvexml2argv-serial-tcp.args | 0 .../bhyvexml2argv-serial-tcp.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-serial-tcp.xml | 0 .../{ => x86_64}/bhyvexml2argv-serial.args | 0 .../{ => x86_64}/bhyvexml2argv-serial.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-serial.xml | 0 .../{ => x86_64}/bhyvexml2argv-slirp-ip.xml | 0 .../bhyvexml2argv-slirp-mac-addr.args | 0 .../bhyvexml2argv-slirp-mac-addr.ldargs | 0 .../bhyvexml2argv-slirp-mac-addr.xml | 0 .../{ => x86_64}/bhyvexml2argv-slirp.args | 0 .../{ => x86_64}/bhyvexml2argv-slirp.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-slirp.xml | 0 .../{ => x86_64}/bhyvexml2argv-sound.args | 0 .../{ => x86_64}/bhyvexml2argv-sound.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-sound.xml | 0 ...gv-uefi-nvram-template-and-source-set.args | 0 ...uefi-nvram-template-and-source-set.ldargs} | 0 ...rgv-uefi-nvram-template-and-source-set.xml | 0 ...bhyvexml2argv-uefi-nvram-template-set.args | 0 ...vexml2argv-uefi-nvram-template-set.ldargs} | 0 .../bhyvexml2argv-uefi-nvram-template-set.xml | 0 .../bhyvexml2argv-uefi-nvram.args | 0 .../bhyvexml2argv-uefi-nvram.ldargs} | 0 .../{ => x86_64}/bhyvexml2argv-uefi-nvram.xml | 0 .../{ => x86_64}/bhyvexml2argv-uefi.args | 0 .../bhyvexml2argv-uefi.ldargs} | 0 .../{ => x86_64}/bhyvexml2argv-uefi.xml | 0 ...yvexml2argv-virtio-rnd-backend-builtin.xml | 0 ...io-rnd-backend-random-non-default-file.xml | 0 .../bhyvexml2argv-virtio-rnd-transitional.xml | 0 .../bhyvexml2argv-virtio-rnd.args | 0 .../bhyvexml2argv-virtio-rnd.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-virtio-rnd.xml | 0 .../bhyvexml2argv-vnc-autoport.args | 0 .../bhyvexml2argv-vnc-autoport.ldargs} | 0 .../bhyvexml2argv-vnc-autoport.xml | 0 .../bhyvexml2argv-vnc-password-comma.xml | 0 .../bhyvexml2argv-vnc-password.args | 0 .../bhyvexml2argv-vnc-password.ldargs} | 0 .../bhyvexml2argv-vnc-password.xml | 0 .../bhyvexml2argv-vnc-resolution.args | 0 .../bhyvexml2argv-vnc-resolution.ldargs} | 0 .../bhyvexml2argv-vnc-resolution.xml | 0 .../bhyvexml2argv-vnc-vgaconf-io.args | 0 .../bhyvexml2argv-vnc-vgaconf-io.ldargs} | 0 .../bhyvexml2argv-vnc-vgaconf-io.xml | 0 .../bhyvexml2argv-vnc-vgaconf-off.args | 0 .../bhyvexml2argv-vnc-vgaconf-off.ldargs} | 0 .../bhyvexml2argv-vnc-vgaconf-off.xml | 0 .../bhyvexml2argv-vnc-vgaconf-on.args | 0 .../bhyvexml2argv-vnc-vgaconf-on.ldargs} | 0 .../bhyvexml2argv-vnc-vgaconf-on.xml | 0 .../bhyvexml2argv-vnc-wait-no.args | 0 .../bhyvexml2argv-vnc-wait-no.ldargs} | 0 .../bhyvexml2argv-vnc-wait-no.xml | 0 .../{ => x86_64}/bhyvexml2argv-vnc-wait.args | 0 .../bhyvexml2argv-vnc-wait.ldargs} | 0 .../{ => x86_64}/bhyvexml2argv-vnc-wait.xml | 0 .../{ => x86_64}/bhyvexml2argv-vnc.args | 0 .../x86_64/bhyvexml2argv-vnc.ldargs | 1 + .../{ => x86_64}/bhyvexml2argv-vnc.xml | 0 .../{ => x86_64}/bhyvexml2argv-wired.args | 0 .../{ => x86_64}/bhyvexml2argv-wired.ldargs | 0 .../{ => x86_64}/bhyvexml2argv-wired.xml | 0 ...hyvexml2argv-xhci-multiple-controllers.xml | 0 .../bhyvexml2argv-xhci-multiple-devs.xml | 0 .../bhyvexml2argv-xhci-no-devs.xml | 0 tests/bhyvexml2argvtest.c | 25 +++-- .../aarch64/bhyvexml2xmlout-base.xml | 30 ++++++ .../aarch64/bhyvexml2xmlout-bootloader.xml | 31 +++++++ .../aarch64/bhyvexml2xmlout-console.xml | 38 ++++++++ .../bhyvexml2xmlout-2-nvme-2-controllers.xml | 0 .../bhyvexml2xmlout-4-consoles.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-acpiapic.xml | 0 ...l2xmlout-addr-isa-controller-on-slot-1.xml | 0 ...2xmlout-addr-isa-controller-on-slot-31.xml | 0 ...ml2xmlout-addr-more-than-32-sata-disks.xml | 0 ...yvexml2xmlout-addr-multiple-sata-disks.xml | 0 ...exml2xmlout-addr-multiple-virtio-disks.xml | 0 ...lout-addr-no32devs-multiple-sata-disks.xml | 0 ...2xmlout-addr-no32devs-single-sata-disk.xml | 0 .../bhyvexml2xmlout-addr-single-sata-disk.xml | 0 ...hyvexml2xmlout-addr-single-virtio-disk.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-base.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 0 ...bhyvexml2xmlout-bhyveload-explicitargs.xml | 0 .../bhyvexml2xmlout-commandline.xml | 0 ...out-console-master-slave-not-specified.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-console.xml | 0 .../bhyvexml2xmlout-custom-loader.xml | 0 .../bhyvexml2xmlout-disk-cdrom-grub.xml | 0 .../bhyvexml2xmlout-disk-cdrom.xml | 0 .../bhyvexml2xmlout-disk-virtio.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-fs-9p.xml | 0 .../bhyvexml2xmlout-grub-bootorder.xml | 0 .../bhyvexml2xmlout-grub-bootorder2.xml | 0 .../bhyvexml2xmlout-grub-defaults.xml | 0 .../bhyvexml2xmlout-input-xhci-tablet.xml | 0 .../bhyvexml2xmlout-isa-controller.xml | 0 .../bhyvexml2xmlout-localtime.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-macaddr.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-metadata.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-msrs.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-nvme.xml | 0 ...bhyvexml2xmlout-passthru-multiple-devs.xml | 0 .../bhyvexml2xmlout-serial-grub-nocons.xml | 0 .../bhyvexml2xmlout-serial-grub.xml | 0 .../bhyvexml2xmlout-serial-tcp.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-serial.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-slirp.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-sound.xml | 0 .../bhyvexml2xmlout-virtio-rnd.xml | 0 .../bhyvexml2xmlout-vnc-autoport.xml | 0 .../bhyvexml2xmlout-vnc-password.xml | 0 .../bhyvexml2xmlout-vnc-resolution.xml | 0 .../bhyvexml2xmlout-vnc-vgaconf-io.xml | 0 .../bhyvexml2xmlout-vnc-vgaconf-off.xml | 0 .../bhyvexml2xmlout-vnc-vgaconf-on.xml | 0 .../bhyvexml2xmlout-vnc-wait-no.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-wait.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-wired.xml | 0 tests/bhyvexml2xmltest.c | 16 +++- 301 files changed, 313 insertions(+), 46 deletions(-) create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args rename tests/bhyvexml2argvdata/{bhyvexml2argv-bhyveload-timeout.ldargs => aarch64/bhyvexml2argv-base.ldargs} (100%) create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.xml create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.args rename tests/bhyvexml2argvdata/{bhyvexml2argv-addr-non-isa-controller-on-slot-1.ldargs => aarch64/bhyvexml2argv-bootloader.ldargs} (100%) create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.xml create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.xml rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-2-nvme-2-controllers.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-2-nvme-2-controllers.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-2-nvme-2-controllers.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-2-nvme-same-controller.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-2-nvme-same-controller.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-2-nvme-same-controller.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-4-consoles.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-4-consoles.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-4-consoles.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-acpiapic.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-acpiapic.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-acpiapic.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-isa-controller-on-slot-1.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-isa-controller-on-slot-1.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-isa-controller-on-slot-31.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-isa-controller-on-slot-31.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-more-than-32-sata-disks.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-more-than-32-sata-disks.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-multiple-sata-disks.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-multiple-sata-disks.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-multiple-sata-disks.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-multiple-virtio-disks.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-multiple-virtio-disks.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-multiple-virtio-disks.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-single-sata-disk.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-no32devs-single-sata-disk.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-firmware-efi.ldargs => x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-non-isa-controller-on-slot-1.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-single-sata-disk.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-single-sata-disk.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-single-sata-disk.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-single-virtio-disk.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-single-virtio-disk.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-addr-single-virtio-disk.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-base.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-base.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-base.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder1.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder1.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder1.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder2.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder3.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder3.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder3.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder4.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-bootorder5.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-explicitargs.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-explicitargs.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-explicitargs.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-timeout.args (100%) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.ldargs rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-bhyveload-timeout.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-commandline.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-commandline.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-commandline.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-console-master-slave-not-specified.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-console-master-slave-not-specified.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-console-master-slave-not-specified.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-console.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-console.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-console.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-cputopology-nvcpu-mismatch.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-cputopology.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-cputopology.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-cputopology.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-custom-loader.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-custom-loader.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-custom-loader.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom-grub.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom-grub.devmap (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom-grub.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom-grub.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-cdrom.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-virtio-queue-opts.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-virtio-rotation-rate.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-virtio.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-virtio.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-disk-virtio.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-firmware-efi.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-uefi-nvram-template-and-source-set.ldargs => x86_64/bhyvexml2argv-firmware-efi.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-firmware-efi.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p-readonly.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p-readonly.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p-readonly.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p-unsupported-accessmode.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p-unsupported-driver.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p-unsupported-type.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-fs-9p.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder.devmap (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder2.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder2.devmap (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder2.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-bootorder2.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-defaults.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-defaults.devmap (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-defaults.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-grub-defaults.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-input-xhci-tablet.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-input-xhci-tablet.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-input-xhci-tablet.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-isa-controller.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-isa-controller.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-isa-controller.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-isa-multiple-controllers.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-localtime.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-localtime.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-localtime.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-macaddr.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-macaddr.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-macaddr.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-metadata.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-msrs.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-msrs.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-msrs.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-net-e1000.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-net-e1000.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-net-e1000.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-nvme.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-nvme.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-nvme.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-passthru-multiple-devs.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-passthru-multiple-devs.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-passthru-multiple-devs.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-passthru.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-passthru.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-passthru.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-sata-rotation-rate.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-sata-rotation-rate.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-sata-rotation-rate.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub-nocons.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub-nocons.devmap (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub-nocons.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub-nocons.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub.devmap (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-grub.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-invalid-port.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-invalid-port.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-invalid-port.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-tcp.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-tcp.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial-tcp.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-serial.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp-ip.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp-mac-addr.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp-mac-addr.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp-mac-addr.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-slirp.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-sound.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-sound.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-sound.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi-nvram-template-and-source-set.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-uefi-nvram-template-set.ldargs => x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi-nvram-template-and-source-set.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi-nvram-template-set.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-uefi-nvram.ldargs => x86_64/bhyvexml2argv-uefi-nvram-template-set.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi-nvram-template-set.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi-nvram.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-uefi.ldargs => x86_64/bhyvexml2argv-uefi-nvram.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi-nvram.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-autoport.ldargs => x86_64/bhyvexml2argv-uefi.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-uefi.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-virtio-rnd-backend-builtin.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-virtio-rnd-backend-random-non-default-file.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-virtio-rnd-transitional.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-virtio-rnd.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-virtio-rnd.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-virtio-rnd.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-autoport.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-password.ldargs => x86_64/bhyvexml2argv-vnc-autoport.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-autoport.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-password-comma.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-password.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-resolution.ldargs => x86_64/bhyvexml2argv-vnc-password.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-password.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-resolution.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-vgaconf-io.ldargs => x86_64/bhyvexml2argv-vnc-resolution.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-resolution.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-vgaconf-io.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-vgaconf-off.ldargs => x86_64/bhyvexml2argv-vnc-vgaconf-io.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-vgaconf-io.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-vgaconf-off.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-vgaconf-on.ldargs => x86_64/bhyvexml2argv-vnc-vgaconf-off.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-vgaconf-off.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-vgaconf-on.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-wait-no.ldargs => x86_64/bhyvexml2argv-vnc-vgaconf-on.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-vgaconf-on.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-wait-no.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc-wait.ldargs => x86_64/bhyvexml2argv-vnc-wait-no.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-wait-no.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-wait.args (100%) rename tests/bhyvexml2argvdata/{bhyvexml2argv-vnc.ldargs => x86_64/bhyvexml2argv-vnc-wait.ldargs} (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc-wait.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc.args (100%) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.ldargs rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-wired.args (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-wired.ldargs (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-wired.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-xhci-multiple-controllers.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-xhci-multiple-devs.xml (100%) rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-xhci-no-devs.xml (100%) create mode 100644 tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml create mode 100644 tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-bootloader.xml create mode 100644 tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-2-nvme-2-controllers.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-4-consoles.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-acpiapic.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-isa-controller-on-slot-31.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-multiple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-multiple-virtio-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-single-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-single-virtio-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-base.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder1.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder3.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder4.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-explicitargs.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-commandline.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-console-master-slave-not-specified.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-console.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-custom-loader.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-disk-cdrom-grub.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-disk-cdrom.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-disk-virtio.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-fs-9p.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-grub-bootorder.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-grub-bootorder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-grub-defaults.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-input-xhci-tablet.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-isa-controller.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-localtime.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-macaddr.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-metadata.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-msrs.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-nvme.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-passthru-multiple-devs.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial-grub-nocons.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial-grub.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial-tcp.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-slirp.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-sound.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-virtio-rnd.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-autoport.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-password.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-resolution.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-io.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-off.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-on.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-wait-no.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-wait.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-wired.xml (100%) -- 2.51.2

2 10

[PATCH] virjsontest: Add test for nesting depth
by Peter Krempa 05 Jan '26

05 Jan '26

From: Peter Krempa <pkrempa(a)redhat.com> Add an example of 250 layer deep nested JSON to make sure the parser supports it. This is in order to maintain compatibility with external snapshots in qemu, where such a deeply nested document is returned with a 'query-block' QMP call. I've used a fake JSON as a real reply from qemu is around 1.4MiB for a 200 deep image chain. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- As promised for the JSON nesting fix. Obviously works only when applied on top of it. tests/virjsondata/parse-nesting-in.json | 1 + tests/virjsondata/parse-nesting-out.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 tests/virjsondata/parse-nesting-in.json create mode 120000 tests/virjsondata/parse-nesting-out.json diff --git a/tests/virjsondata/parse-nesting-in.json b/tests/virjsondata/parse-nesting-in.json new file mode 100644 index 0000000000..8bbe1a3439 --- /dev/null +++ b/tests/virjsondata/parse-nesting-in.json @@ -0,0 +1 @@ +{"n249": {"n248": {"n247": {"n246": {"n245": {"n244": {"n243": {"n242": {"n241": {"n240": {"n239": {"n238": {"n237": {"n236": {"n235": {"n234": {"n233": {"n232": {"n231": {"n230": {"n229": {"n228": {"n227": {"n226": {"n225": {"n224": {"n223": {"n222": {"n221": {"n220": {"n219": {"n218": {"n217": {"n216": {"n215": {"n214": {"n213": {"n212": {"n211": {"n210": {"n209": {"n208": {"n207": {"n206": {"n205": {"n204": {"n203": {"n202": {"n201": {"n200": {"n199": {"n198": {"n197": {"n196": {"n195": {"n194": {"n193": {"n192": {"n191": {"n190": {"n189": {"n188": {"n187": {"n186": {"n185": {"n184": {"n183": {"n182": {"n181": {"n180": {"n179": {"n178": {"n177": {"n176": {"n175": {"n174": {"n173": {"n172": {"n171": {"n170": {"n169": {"n168": {"n167": {"n166": {"n165": {"n164": {"n163": {"n162": {"n161": {"n160": {"n159": {"n158": {"n157": {"n156": {"n155": {"n154": {"n153": {"n152": {"n151": {"n150": {"n149": {"n148": {"n147": {"n146": {"n145": {"n144": {"n143": {"n142": {"n141": {"n140": {"n139": {"n138": {"n137": {"n136": {"n135": {"n134": {"n133": {"n132": {"n131": {"n130": {"n129": {"n128": {"n127": {"n126": {"n125": {"n124": {"n123": {"n122": {"n121": {"n120": {"n119": {"n118": {"n117": {"n116": {"n115": {"n114": {"n113": {"n112": {"n111": {"n110": {"n109": {"n108": {"n107": {"n106": {"n105": {"n104": {"n103": {"n102": {"n101": {"n100": {"n99": {"n98": {"n97": {"n96": {"n95": {"n94": {"n93": {"n92": {"n91": {"n90": {"n89": {"n88": {"n87": {"n86": {"n85": {"n84": {"n83": {"n82": {"n81": {"n80": {"n79": {"n78": {"n77": {"n76": {"n75": {"n74": {"n73": {"n72": {"n71": {"n70": {"n69": {"n68": {"n67": {"n66": {"n65": {"n64": {"n63": {"n62": {"n61": {"n60": {"n59": {"n58": {"n57": {"n56": {"n55": {"n54": {"n53": {"n52": {"n51": {"n50": {"n49": {"n48": {"n47": {"n46": {"n45": {"n44": {"n43": {"n42": {"n41": {"n40": {"n39": {"n38": {"n37": {"n36": {"n35": {"n34": {"n33": {"n32": {"n31": {"n30": {"n29": {"n28": {"n27": {"n26": {"n25": {"n24": {"n23": {"n22": {"n21": {"n20": {"n19": {"n18": {"n17": {"n16": {"n15": {"n14": {"n13": {"n12": {"n11": {"n10": {"n9": {"n8": {"n7": {"n6": {"n5": {"n4": {"n3": {"n2": {"n1": {"n0": "end"}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} diff --git a/tests/virjsondata/parse-nesting-out.json b/tests/virjsondata/parse-nesting-out.json new file mode 120000 index 0000000000..d269172843 --- /dev/null +++ b/tests/virjsondata/parse-nesting-out.json @@ -0,0 +1 @@ +parse-nesting-in.json \ No newline at end of file -- 2.52.0

2 1

Plans for 12.0.0 release (freeze on 2026-01-09)
by Jiri Denemark 05 Jan '26

05 Jan '26

We are getting close to 12.0.0 release of libvirt. To aim for the release on Thursday 15 Jan I suggest entering the freeze on Friday 09 Jan and tagging RC2 on Tuesday 13 Jan. I hope this works for everyone. Jirka

1 0

[PATCH] bhyve: rework capabilities probing
by Roman Bogorodskiy 02 Jan '26

02 Jan '26

Currently, to probe PCI devices, for each device libvirt calls "bhyve -s 0,<device_type>" and parses the error message to check if this specific device is supported. For quite some time, bhyve reports the list of devices using: bhyve -s help where it prints all supported devices, one device per line. Update the code to use this command: * It is more accurate as we don't need to rely on the error message parsing. * It's faster as we get all the devices in one run instead of running bhyve for every device type. * The code is simpler. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 139 ++++++++++----------------------- 1 file changed, 40 insertions(+), 99 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 0585fff8e9..2e5e2ae3bc 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -258,24 +258,51 @@ bhyveProbeCapsFromHelp(unsigned int *caps, char *binary) } static int -bhyveProbeCapsAHCI32Slot(unsigned int *caps, char *binary) +bhyveFillCapForDevice(unsigned int *caps, const char *device) { - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,ahci", - "pci slot 0:0: unknown device \"ahci\"", - BHYVE_CAP_AHCI32SLOT); + if (STREQ(device, "ahci")) + *caps |= BHYVE_CAP_AHCI32SLOT; + else if (STREQ(device, "e1000")) + *caps |= BHYVE_CAP_NET_E1000; + else if (STREQ(device, "fbuf")) + *caps |= BHYVE_CAP_FBUF; + else if (STREQ(device, "hda")) + *caps |= BHYVE_CAP_SOUND_HDA; + else if (STREQ(device, "nvme")) + *caps |= BHYVE_CAP_NVME; + else if (STREQ(device, "virtio-9p")) + *caps |= BHYVE_CAP_VIRTIO_9P; + else if (STREQ(device, "virtio-rnd")) + *caps |= BHYVE_CAP_VIRTIO_RND; + else if (STREQ(device, "xhci")) + *caps |= BHYVE_CAP_XHCI; + + return 0; } static int -bhyveProbeCapsNetE1000(unsigned int *caps, char *binary) +bhyveProbeCapsFromSHelp(unsigned int *caps, char *binary) { - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,e1000", - "pci slot 0:0: unknown device \"e1000\"", - BHYVE_CAP_NET_E1000); + g_autofree char *help = NULL; + g_autoptr(virCommand) cmd = NULL; + int exit; + char *cur = NULL; + char *saveptr = NULL; + + cmd = virCommandNew(binary); + virCommandAddArgList(cmd, "-s", "help", NULL); + virCommandSetOutputBuffer(cmd, &help); + if (virCommandRun(cmd, &exit) < 0) + return -1; + + cur = strtok_r(help, "\n", &saveptr); + while (cur != NULL) { + bhyveFillCapForDevice(caps, cur); + cur = strtok_r(NULL, "\n", &saveptr); + } + + return 0; } static int @@ -289,39 +316,6 @@ bhyveProbeCapsLPC_Bootrom(unsigned int *caps, char *binary) } -static int -bhyveProbeCapsFramebuffer(unsigned int *caps, char *binary) -{ - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,fbuf", - "pci slot 0:0: unknown device \"fbuf\"", - BHYVE_CAP_FBUF); -} - - -static int -bhyveProbeCapsXHCIController(unsigned int *caps, char *binary) -{ - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,xhci", - "pci slot 0:0: unknown device \"xhci\"", - BHYVE_CAP_FBUF); -} - - -static int -bhyveProbeCapsSoundHda(unsigned int *caps, char *binary) -{ - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,hda", - "pci slot 0:0: unknown device \"hda\"", - BHYVE_CAP_SOUND_HDA); -} - - static int bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) { @@ -333,39 +327,6 @@ bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) } -static int -bhyveProbeCapsVirtio9p(unsigned int *caps, char *binary) -{ - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,virtio-9p", - "pci slot 0:0: unknown device \"hda\"", - BHYVE_CAP_VIRTIO_9P); -} - - -static int -bhyveProbeCapsVirtioRnd(unsigned int *caps, char *binary) -{ - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,virtio-rnd", - "pci slot 0:0: unknown device \"virtio-rnd\"", - BHYVE_CAP_VIRTIO_RND); -} - - -static int -bhyveProbeCapsNvme(unsigned int *caps, char *binary) -{ - return bhyveProbeCapsDeviceHelper(caps, binary, - "-s", - "0,nvme", - "pci slot 0:0: unknown device \"nvme\"", - BHYVE_CAP_NVME); -} - - int virBhyveProbeCaps(unsigned int *caps) { @@ -379,35 +340,15 @@ virBhyveProbeCaps(unsigned int *caps) if ((ret = bhyveProbeCapsFromHelp(caps, binary))) goto out; - if ((ret = bhyveProbeCapsAHCI32Slot(caps, binary))) - goto out; - - if ((ret = bhyveProbeCapsNetE1000(caps, binary))) + if ((ret = bhyveProbeCapsFromSHelp(caps, binary))) goto out; if ((ret = bhyveProbeCapsLPC_Bootrom(caps, binary))) goto out; - if ((ret = bhyveProbeCapsFramebuffer(caps, binary))) - goto out; - - if ((ret = bhyveProbeCapsXHCIController(caps, binary))) - goto out; - - if ((ret = bhyveProbeCapsSoundHda(caps, binary))) - goto out; - if ((ret = bhyveProbeCapsVNCPassword(caps, binary))) goto out; - if ((ret = bhyveProbeCapsVirtio9p(caps, binary))) - goto out; - - if ((ret = bhyveProbeCapsVirtioRnd(caps, binary))) - goto out; - - if ((ret = bhyveProbeCapsNvme(caps, binary))) - goto out; out: VIR_FREE(binary); -- 2.52.0

2 1