Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- .../bhyvexml2xmlout-2-nvme-2-controllers.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-4-consoles.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-acpiapic.xml | 0 ...bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml | 0 ...hyvexml2xmlout-addr-isa-controller-on-slot-31.xml | 0 .../bhyvexml2xmlout-addr-more-than-32-sata-disks.xml | 0 .../bhyvexml2xmlout-addr-multiple-sata-disks.xml | 0 .../bhyvexml2xmlout-addr-multiple-virtio-disks.xml | 0 ...exml2xmlout-addr-no32devs-multiple-sata-disks.xml | 0 ...hyvexml2xmlout-addr-no32devs-single-sata-disk.xml | 0 .../bhyvexml2xmlout-addr-single-sata-disk.xml | 0 .../bhyvexml2xmlout-addr-single-virtio-disk.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-base.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 0 .../bhyvexml2xmlout-bhyveload-explicitargs.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-commandline.xml | 0 ...xml2xmlout-console-master-slave-not-specified.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-console.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-custom-loader.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-disk-cdrom-grub.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-disk-cdrom.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-disk-virtio.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-fs-9p.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-grub-bootorder.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-grub-bootorder2.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-grub-defaults.xml | 0 .../bhyvexml2xmlout-input-xhci-tablet.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-isa-controller.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-localtime.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-macaddr.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-metadata.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-msrs.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-nvme.xml | 0 .../bhyvexml2xmlout-passthru-multiple-devs.xml | 0 .../bhyvexml2xmlout-serial-grub-nocons.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-serial-grub.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-serial-tcp.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-serial.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-slirp.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-sound.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-virtio-rnd.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-autoport.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-password.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-resolution.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-io.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-off.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-on.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-wait-no.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc-wait.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-vnc.xml | 0 .../{ => x86_64}/bhyvexml2xmlout-wired.xml | 0 tests/bhyvexml2xmltest.c | 12 ++++++++---- 56 files changed, 8 insertions(+), 4 deletions(-) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-2-nvme-2-controllers.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-4-consoles.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-acpiapic.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-isa-controller-on-slot-31.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-multiple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-multiple-virtio-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-single-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-addr-single-virtio-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-base.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder1.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder3.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-bootorder4.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-bhyveload-explicitargs.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-commandline.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-console-master-slave-not-specified.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-console.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-custom-loader.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-disk-cdrom-grub.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-disk-cdrom.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-disk-virtio.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-fs-9p.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-grub-bootorder.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-grub-bootorder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-grub-defaults.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-input-xhci-tablet.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-isa-controller.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-localtime.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-macaddr.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-metadata.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-msrs.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-nvme.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-passthru-multiple-devs.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial-grub-nocons.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial-grub.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial-tcp.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-serial.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-slirp.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-sound.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-virtio-rnd.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-autoport.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-password.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-resolution.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-io.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-off.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-vgaconf-on.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-wait-no.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc-wait.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-vnc.xml (100%) rename tests/bhyvexml2xmloutdata/{ => x86_64}/bhyvexml2xmlout-wired.xml (100%) diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-2-nvme-2-controllers.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-2-nvme-2-controllers.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-2-nvme-2-controllers.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-2-nvme-2-controllers.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-4-consoles.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-4-consoles.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-acpiapic.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-acpiapic.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-on-slot-31.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-controller-on-slot-31.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-on-slot-31.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-controller-on-slot-31.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-virtio-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-virtio-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-sata-disk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-sata-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-virtio-disk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-virtio-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-base.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-base.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder1.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder1.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder2.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder2.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder3.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder3.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder4.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder4.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-explicitargs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-explicitargs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-commandline.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-commandline.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-not-specified.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console-master-slave-not-specified.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-not-specified.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console-master-slave-not-specified.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-custom-loader.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-custom-loader.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom-grub.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom-grub.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-virtio.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-virtio.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-fs-9p.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-fs-9p.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder2.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder2.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-defaults.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-defaults.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-input-xhci-tablet.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-input-xhci-tablet.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-isa-controller.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-isa-controller.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-localtime.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-localtime.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-macaddr.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-macaddr.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-metadata.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-metadata.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-msrs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-msrs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-msrs.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-msrs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-nvme.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-nvme.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-passthru-multiple-devs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-passthru-multiple-devs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-passthru-multiple-devs.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-passthru-multiple-devs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub-nocons.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub-nocons.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-tcp.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-tcp.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-tcp.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-tcp.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-slirp.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-slirp.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-slirp.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-slirp.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-sound.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-sound.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-sound.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-sound.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-virtio-rnd.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-virtio-rnd.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-autoport.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-autoport.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-password.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-password.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-resolution.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-resolution.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-io.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-io.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-off.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-off.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-on.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-on.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait-no.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait-no.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait-no.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait-no.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-wired.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-wired.xml diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 9d8e910b6e..5571b25341 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -30,11 +30,12 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *xml_out = NULL; bool is_different = info->flags & FLAG_IS_DIFFERENT; int ret = -1; + const char *arch = virArchToString(virArchFromHost()); - 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); + xml_in = g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.xml", + abs_srcdir, arch, info->name); + xml_out = g_strdup_printf("%s/bhyvexml2xmloutdata/%s/bhyvexml2xmlout-%s.xml", + abs_srcdir, arch, info->name); ret = testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, xml_in, is_different ? xml_out : xml_in, @@ -142,6 +143,9 @@ mymain(void) /* USB xhci tablet */ DO_TEST_DIFFERENT("input-xhci-tablet"); + virTestSetHostArch(VIR_ARCH_AARCH64); + driver.caps = virBhyveCapsBuild(); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 2.51.2