bhyve: tests: prepare for arm64 xml2xml tests

Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

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-virtio-scsi.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-virtio-scsi.xml
similarity index 100%
rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.xml
rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-virtio-scsi.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 f4e36bcbcfe4c9c40c81596539accdfab797cdfa..38c4784470656c4bc5fb1ed9c32974a9b87f7a46 100644 (file)
--- 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,
@@ -143,6 +144,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);