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

On 12/28/25 09:51, Roman Bogorodskiy wrote:
> 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.

WFM, BUT even this work you posted deserves a NEWS.rst entry ;-)
Feel free to add it as a 10th patch.

> 
> 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


>  301 files changed, 313 insertions(+), 46 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal