From nobody Fri Jan 9 08:53:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1766912838; cv=none; d=zohomail.com; s=zohoarc; b=Yeog06a/qojl6FscOqW2ci0GLprvyiTriWAatBHH6n0ru0r0D/VfPIrPbj9dpe+IRQVi7tDbw7rYO+8w/beZyvTeQIJy8KDW+bV3XUidgKiSDYiWvSNjVZJkmnbB5L8VZM2woKAGmCFXoVywtUt2qb6jN2Wo8qijpAkrYXdMegs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912838; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=UmSzNWTk5Z4TZFuYjbNc6Q2UgGnQ6vN1PBJOqa9mGSk=; b=oFzhE8cxgDGhbByUi+MaKZjcqWx/SloN/M7/z7TrBuj1IXpS03M/+YDwEUrWdd+08wRoWYABoZ/7AwqjBPHQziUpKFf4Y6aYilWOMSv3io/2+Vj+FbwS1+S3nujLK6nwEiZmcB5TsMHIMplNidzzzdwH0tZVVqqC3mG0Sgb23Sk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912838616514.9756338216317; Sun, 28 Dec 2025 01:07:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id BDA6F417D0; Sun, 28 Dec 2025 04:07:17 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 4383141BE0; Sun, 28 Dec 2025 03:57:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id ADA063FBCB; Sun, 28 Dec 2025 03:54:47 -0500 (EST) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D76B03FBC4 for ; Sun, 28 Dec 2025 03:54:45 -0500 (EST) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b72b495aa81so1382947366b.2 for ; Sun, 28 Dec 2025 00:54:45 -0800 (PST) Received: from tulp.my.domain (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8037f0ebbasm2843201266b.55.2025.12.28.00.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:42 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766912084; x=1767516884; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UmSzNWTk5Z4TZFuYjbNc6Q2UgGnQ6vN1PBJOqa9mGSk=; b=aBNY+CNfjDbZ51GbbZZfvPBal2uQBqdnt7x6dZiP57vxilEAsc3jAcTQtkuTCS4rLw EoEvX5yWdZGb5b3sbgSeO8W8QF1cpA5UqRVECffcY9r1/aKmpcLUb0XVlvxhHdbDKpqf h7JBd7KyV03SIe4ct8oMkqTD8bXgjkRRzwc6h6pxtaQ26tMgDAehW6eeTNXcNb0oxfeO as7uhH7udhwJI6ZG4EUXRaV7kITgTxAzfzgj4uUJmtcyrmNOYxjxPw/CT6f5KAkKeOIt mxNgpodd8/XjJ7sbv9zp2qXbga6EBN/Qz9rJ+qJFV/gTm9QiY+XKkZPgQtLk+x3Eab4X QMfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912084; x=1767516884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UmSzNWTk5Z4TZFuYjbNc6Q2UgGnQ6vN1PBJOqa9mGSk=; b=HxuHrsAplIMArL53GMAyPPG8YXcb/ttGbwu7Erzy0o0DZNl0IL0kAgexS6/+1PSn2N 6NbDVTGpBjrFUu9nO/sHw8RGRL0o9ArLiQWAZoF6kW/dJxUNSPFvxFiPLANvaliHhIwX dYYQulq/I4R9b7X6Vj5s3zOXpnlKd+GHXdaxq0nIx2ggzHMGJtEkOXDdfG+K+yagSoZk bNfTXfSOGU76eOJQxh0fMKFjocEU7lIwHGq5aV7mHF0fVv6xzwPSmrvDjZaQHHSWHIVy KtvKgigu3PrrmErAVUPdGSQ7C0KUI4X7CUWMR/44Lxb/pc1Dr03FOgeRgkgoY0hjS7Gu YPQw== X-Gm-Message-State: AOJu0Yxy6/TVPfcWjRLNOf//QkdUpGmhdv1fAgUdJ/lppfIBZUpzuj4k ctSF6qmrT2RkRtuvpL21HFvtGdRUwAyBohpql2auXqkioUpKSzI25c+KBY8X7xx+ X-Gm-Gg: AY/fxX6WmSIXmbN7kvJrzHRg67V0fezuq4nGrRzKSzj85g5CZNUiJy97PKxQqnT3WPU y1pnWw/h+mNy1RdlSaGlScsZmO7mrVUjdSzGTdPj8ivJCa6gZYdYumQ9Ofru76X4WkcRGoXpoTZ RibVIQOewRc2jpyk6xeyk5NnkVFfIMZBphp9PabvHCKEkcqtPVKLVzdemHJ77liCfdklPvHN5N0 xBkeNu8bN58N3RfbilGofQxB8HhInqF1Arygv3WdE6G4wFW75ypJJJ6Z1zEokipFYW4m/7lcg3q TL/dJ6vujnXUsF0DRQbLUoy4KBcpsybLjJDHa+3YAdhfOyE904ZnmecNbR3LrnqkEpDCuPiucsL milfYfh9FsqfbvlNp6kzYdQfF+Om5VXrTBJ8GX7hPiDSUXapXs6VD9uCgOzx5DY7owKGnwLragu g36e8nEYkwJNMtOphw3OaB6cb7hJuTxOKPSth8G0mabPkq7zQnzg== X-Google-Smtp-Source: AGHT+IET9Qjp02rpUk5zfZA2vYUj8d8eZxM8QBUuqej83GYh5jC5izn2eEME2RV/I3KyXMO8EyKeCg== X-Received: by 2002:a17:906:ef08:b0:b72:6728:5bb1 with SMTP id a640c23a62f3a-b803726dd35mr3271962866b.56.1766912083881; Sun, 28 Dec 2025 00:54:43 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 7/9] bhyve: tests: prepare for arm64 xml2xml tests Date: Sun, 28 Dec 2025 09:51:10 +0100 Message-ID: <20251228085112.81805-8-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251228085112.81805-1-bogorodskiy@gmail.com> References: <20251228085112.81805-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z24JLH3J2R5ZZQQNSOEQQ4RCJUEICQYH X-Message-ID-Hash: Z24JLH3J2R5ZZQQNSOEQQ4RCJUEICQYH X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912839727158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy --- .../bhyvexml2xmlout-2-nvme-2-controllers.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-4-consoles.xml | 0 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> x86_64}/bhyvexml2xmlout-commandline.xml | 0 ...xml2xmlout-console-master-slave-not-specified.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-console.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-custom-loader.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom-grub.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-disk-virtio.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-fs-9p.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-grub-bootorder.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-grub-bootorder2.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-grub-defaults.xml | 0 .../bhyvexml2xmlout-input-xhci-tablet.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-isa-controller.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-localtime.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-macaddr.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-metadata.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-msrs.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-nvme.xml | 0 .../bhyvexml2xmlout-passthru-multiple-devs.xml | 0 .../bhyvexml2xmlout-serial-grub-nocons.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-serial-grub.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-serial-tcp.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-serial.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-slirp.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-sound.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-virtio-rnd.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-autoport.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-password.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-resolution.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgaconf-io.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgaconf-off.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgaconf-on.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait-no.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-wired.xml | 0 tests/bhyvexml2xmltest.c | 12 ++++++++---- 56 files changed, 8 insertions(+), 4 deletions(-) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-2-nvme-2-c= ontrollers.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-4-consoles= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-acpiapic.x= ml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-isa-c= ontroller-on-slot-1.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-isa-c= ontroller-on-slot-31.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-more-= than-32-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-multi= ple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-multi= ple-virtio-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-no32d= evs-multiple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-no32d= evs-single-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-singl= e-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-singl= e-virtio-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-base.xml (= 100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder1.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder3.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder4.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= explicitargs.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-commandlin= e.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-console-ma= ster-slave-not-specified.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-console.xm= l (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-custom-loa= der.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom= -grub.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-disk-virti= o.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-fs-9p.xml = (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-grub-booto= rder.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-grub-booto= rder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-grub-defau= lts.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-input-xhci= -tablet.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-isa-contro= ller.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-localtime.= xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-macaddr.xm= l (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-metadata.x= ml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-msrs.xml (= 100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-nvme.xml (= 100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-passthru-m= ultiple-devs.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial-gru= b-nocons.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial-gru= b.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial-tcp= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial.xml= (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-slirp.xml = (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-sound.xml = (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-virtio-rnd= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-autopo= rt.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-passwo= rd.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-resolu= tion.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgacon= f-io.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgacon= f-off.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgacon= f-on.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait-n= o.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait.x= ml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc.xml (1= 00%) rename tests/bhyvexml2xmloutdata/{ =3D> 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-controller= s.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-2-nvme-2-controllers.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-2-nvme-2-control= lers.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml b/tes= ts/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-c= ontroller-on-slot-1.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-o= n-slot-1.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-control= ler-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-o= n-slot-31.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-control= ler-on-slot-31.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sa= ta-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-more-t= han-32-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sat= a-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-more-than-3= 2-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-d= isks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-s= ata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-di= sks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-sa= ta-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-vi= rtio-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multip= le-sata-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-n= o32devs-multiple-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multipl= e-sata-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-mu= ltiple-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single= -sata-disk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32= devs-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-si= ngle-sata-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-dis= k.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-sata-d= isk.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-d= isk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-virt= io-disk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-di= sk.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-virt= io-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml b/tests/bhy= vexml2xmloutdata/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.x= ml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 1.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der1.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 2.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der2.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 3.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der3.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 4.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der4.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitar= gs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-explici= targs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitarg= s.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-explic= itargs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml b/te= sts/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-conso= le-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-s= lave-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/tes= ts/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/te= sts/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/bh= yvexml2xmloutdata/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.x= ml 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.xm= l 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-table= t.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.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml b/test= s/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/bhy= vexml2xmloutdata/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/bhy= vexml2xmloutdata/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-de= vs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-passthru-multiple= -devs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-passthru-multiple-dev= s.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-passthru-multipl= e-devs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.x= ml 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-noco= ns.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml b/te= sts/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/tes= ts/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/b= hyvexml2xmloutdata/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/bh= yvexml2xmloutdata/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/bh= yvexml2xmloutdata/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/tes= ts/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/t= ests/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/t= ests/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.x= ml 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.x= ml 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.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait-no.xml b/te= sts/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/bhyv= exml2xmloutdata/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/bh= yvexml2xmloutdata/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 =3D NULL; bool is_different =3D info->flags & FLAG_IS_DIFFERENT; int ret =3D -1; + const char *arch =3D virArchToString(virArchFromHost()); =20 - xml_in =3D g_strdup_printf("%s/bhyvexml2argvdata/x86_64/bhyvexml2argv-= %s.xml", - abs_srcdir, info->name); - xml_out =3D g_strdup_printf("%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s= .xml", - abs_srcdir, info->name); + xml_in =3D g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.x= ml", + abs_srcdir, arch, info->name); + xml_out =3D g_strdup_printf("%s/bhyvexml2xmloutdata/%s/bhyvexml2xmlout= -%s.xml", + abs_srcdir, arch, info->name); =20 ret =3D 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"); =20 + virTestSetHostArch(VIR_ARCH_AARCH64); + driver.caps =3D virBhyveCapsBuild(); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); =20 --=20 2.51.2