Signed-off-by: Roman Bogorodskiy <[email protected]>
---
.../aarch64/bhyvexml2argv-base.args | 10 ++++++++
.../bhyvexml2argv-base.ldargs} | 0
.../aarch64/bhyvexml2argv-base.xml | 23 +++++++++++++++++++
.../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
...v-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
...yvexml2argv-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
.../{ => x86_64}/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 | 0
.../{ => 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 | 23 ++++++++++++-------
tests/bhyvexml2xmltest.c | 2 +-
232 files changed, 56 insertions(+), 9 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
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/{ =>
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/{ => 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/{ =>
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/{ =>
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/{ => 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/{ => 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/{ => 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/{ => 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/{ =>
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/{ =>
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/{ =>
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/{ =>
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/{ => 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/{ => 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%)
rename tests/bhyvexml2argvdata/{ => x86_64}/bhyvexml2argv-vnc.ldargs (100%)
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%)
diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args
b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args
new file mode 100644
index 0000000000..b8388f5691
--- /dev/null
+++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args
@@ -0,0 +1,10 @@
+bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+-s 2:0,virtio-blk,/tmp/freebsd.img \
+bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-timeout.ldargs
b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-timeout.ldargs
rename to tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.ldargs
diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.xml
b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.xml
new file mode 100644
index 0000000000..e1454176bf
--- /dev/null
+++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.xml
@@ -0,0 +1,23 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory>219136</memory>
+ <vcpu>1</vcpu>
+ <os>
+ <type>hvm</type>
+ </os>
+ <devices>
+ <disk type='file'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='vda' bus='virtio'/>
+ <address type='drive' controller='0' bus='0' target='2' unit='0'/>
+ </disk>
+ <interface type='bridge'>
+ <mac address='52:54:00:b9:94:02'/>
+ <model type='virtio'/>
+ <source bridge="virbr0"/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x03'
function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-4-consoles.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-4-consoles.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-4-consoles.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-4-consoles.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-4-consoles.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-4-consoles.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-acpiapic.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-acpiapic.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-acpiapic.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-acpiapic.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-acpiapic.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-acpiapic.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-1.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-1.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-1.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-1.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-31.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-31.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-31.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controller-on-slot-31.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sata-disks.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sata-disks.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sata-disks.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sata-disks.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disks.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disks.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disks.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disks.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disks.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disks.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-disks.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-disks.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-disks.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-disks.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-single-sata-disk.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-single-sata-disk.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-single-sata-disk.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-single-sata-disk.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-controller-on-slot-1.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-disk.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-disk.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-disk.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-disk.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-disk.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-disk.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-base.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-base.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-base.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-base.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-base.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-base.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-base.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder2.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder2.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder4.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder4.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder5.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder5.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder5.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder5.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-timeout.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-timeout.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.args
diff --git
a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.ldargs
new file mode 100644
index 0000000000..264ae48441
--- /dev/null
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.ldargs
@@ -0,0 +1,7 @@
+timeout \
+--foreground \
+--verbose \
+-k 20s 300s bhyveload \
+-m 214 \
+-d /tmp/freebsd.img \
+bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-timeout.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-timeout.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-commandline.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-commandline.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-commandline.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-commandline.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-commandline.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-commandline.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-commandline.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console-master-slave-not-specified.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console-master-slave-not-specified.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console-master-slave-not-specified.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console-master-slave-not-specified.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console-master-slave-not-specified.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console-master-slave-not-specified.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-console.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-console.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology-nvcpu-mismatch.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology-nvcpu-mismatch.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-cputopology-nvcpu-mismatch.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology-nvcpu-mismatch.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-custom-loader.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-custom-loader.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-custom-loader.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-custom-loader.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-custom-loader.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-custom-loader.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.devmap
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.devmap
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.devmap
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.devmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio-queue-opts.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio-queue-opts.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio-queue-opts.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio-queue-opts.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio-rotation-rate.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio-rotation-rate.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio-rotation-rate.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio-rotation-rate.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-firmware-efi.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-firmware-efi.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-firmware-efi.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-firmware-efi.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-firmware-efi.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-firmware-efi.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-readonly.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-readonly.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-readonly.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-readonly.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-readonly.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-readonly.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessmode.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-accessmode.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessmode.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-accessmode.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-driver.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-driver.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-type.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-type.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-type.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-type.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.devmap
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.devmap
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.devmap
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.devmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.devmap
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.devmap
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.devmap
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.devmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-bootorder2.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.devmap
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.devmap
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.devmap
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.devmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-grub-defaults.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-input-xhci-tablet.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-input-xhci-tablet.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-input-xhci-tablet.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-input-xhci-tablet.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-input-xhci-tablet.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-input-xhci-tablet.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-controller.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-controller.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-controller.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-controller.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-controller.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-controller.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-controllers.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-multiple-controllers.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-controllers.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-multiple-controllers.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-localtime.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-localtime.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-localtime.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-localtime.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-localtime.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-localtime.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-macaddr.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-macaddr.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-macaddr.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-macaddr.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-macaddr.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-macaddr.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-metadata.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-metadata.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-metadata.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-metadata.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-msrs.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-msrs.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-msrs.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-msrs.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-msrs.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-msrs.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-msrs.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-net-e1000.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-net-e1000.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-net-e1000.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-net-e1000.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-net-e1000.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-net-e1000.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-nvme.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-nvme.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-nvme.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-nvme.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-nvme.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-nvme.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.devmap
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.devmap
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.devmap
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.devmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub-nocons.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.devmap
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.devmap
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.devmap
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.devmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-grub.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-invalid-port.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-invalid-port.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-invalid-port.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-invalid-port.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-invalid-port.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-invalid-port.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-tcp.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-tcp.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-tcp.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-tcp.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-tcp.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-tcp.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-tcp.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-tcp.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-tcp.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-tcp.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial-tcp.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial-tcp.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-serial.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp-ip.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-ip.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp-ip.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-ip.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp-mac-addr.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-mac-addr.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp-mac-addr.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-mac-addr.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp-mac-addr.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-mac-addr.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp-mac-addr.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-mac-addr.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp-mac-addr.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-mac-addr.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp-mac-addr.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp-mac-addr.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-slirp.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-slirp.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-slirp.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sound.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sound.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sound.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sound.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sound.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-sound.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sound.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-set.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.args
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-set.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-set.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.ldargs
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-set.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.ldargs
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-set.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-set.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-and-source-set.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-set.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.args
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-set.args
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-set.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.ldargs
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-set.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-set.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram-template-set.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi-nvram.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-uefi.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-builtin.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-backend-builtin.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-builtin.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-backend-builtin.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-random-non-default-file.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-backend-random-non-default-file.xml
similarity index 100%
rename from
tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-random-non-default-file.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-backend-random-non-default-file.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-transitional.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-transitional.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-transitional.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-transitional.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-autoport.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-autoport.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-autoport.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-autoport.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-autoport.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-autoport.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password-comma.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password-comma.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-password.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-resolution.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-resolution.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-resolution.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-resolution.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-resolution.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-resolution.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-io.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-io.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-io.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-io.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-io.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-io.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-off.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-off.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-off.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-off.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-off.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-off.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-on.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-on.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-on.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-on.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-on.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-vgaconf-on.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait-no.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait-no.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait-no.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait-no.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait-no.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait-no.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait-no.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait-no.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait-no.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait-no.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait-no.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait-no.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc-wait.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc-wait.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-vnc.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-vnc.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-wired.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-wired.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-wired.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-wired.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-wired.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-wired.xml
diff --git
a/tests/bhyvexml2argvdata/bhyvexml2argv-xhci-multiple-controllers.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-multiple-controllers.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-xhci-multiple-controllers.xml
rename to
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-multiple-controllers.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-xhci-multiple-devs.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-multiple-devs.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-xhci-multiple-devs.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-multiple-devs.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-xhci-no-devs.xml
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-no-devs.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-xhci-no-devs.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-no-devs.xml
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index b83051d3cd..e420fde1e9 100644
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -130,15 +130,16 @@ testCompareXMLToArgvHelper(const void *data)
g_autofree char *args = NULL;
g_autofree char *ldargs = NULL;
g_autofree char *dmargs = NULL;
+ const char *arch = virArchToString(virArchFromHost());
- xml = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml",
- abs_srcdir, info->name);
- args = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.args",
- abs_srcdir, info->name);
- ldargs = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.ldargs",
- abs_srcdir, info->name);
- dmargs = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.devmap",
- abs_srcdir, info->name);
+ xml = g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.xml",
+ abs_srcdir, arch, info->name);
+ args = g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.args",
+ abs_srcdir, arch, info->name);
+ ldargs = g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.ldargs",
+ abs_srcdir, arch, info->name);
+ dmargs = g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.devmap",
+ abs_srcdir, arch, info->name);
return testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags);
}
@@ -328,6 +329,12 @@ mymain(void)
driver.config->bhyveloadTimeoutKill = 20;
DO_TEST("bhyveload-timeout");
+ /* arm64 tests */
+ virTestSetHostArch(VIR_ARCH_AARCH64);
+ driver.caps = virBhyveCapsBuild();
+
+ DO_TEST("base");
+
virObjectUnref(driver.caps);
virObjectUnref(driver.xmlopt);
virPortAllocatorRangeFree(driver.remotePorts);
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c
index 0abc50b0de..9d8e910b6e 100644
--- a/tests/bhyvexml2xmltest.c
+++ b/tests/bhyvexml2xmltest.c
@@ -31,7 +31,7 @@ testCompareXMLToXMLHelper(const void *data)
bool is_different = info->flags & FLAG_IS_DIFFERENT;
int ret = -1;
- xml_in = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml",
+ xml_in =
g_strdup_printf("%s/bhyvexml2argvdata/x86_64/bhyvexml2argv-%s.xml",
abs_srcdir, info->name);
xml_out = g_strdup_printf("%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s.xml",
abs_srcdir, info->name);
--
2.51.2
