From nobody Fri Jan  9 08:53:58 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=1766912662; cv=none;
	d=zohomail.com; s=zohoarc;
	b=DbWan2RnxgLLRoLEVMQEGjC1fcffRooCaOzqMs70z7KXj5FaBG4PUIpMuLb+4X5UpI1A6GTXInW4I376t5nsGUr5w6UfjCFbtI1h6dk88It+6id9eonTWW4TlvbnmgkFoQV0VoGbo2R9EsMiyD6dgDPEI3arA/KZ5i7UDFLIBCE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1766912662;
 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=uDJT9mULnLx7/9k2iMKp1H7BFUdpNnxrsU7ypWnJ0+k=;
	b=DGCb+QRNKWTn/N9M9pLbveD2w8VTmGixa/ukqvATuLKudHH/KRIfAQ9+naYFaFLpagwp/A5iaPRhUL+aG+ZciPn/o5rnqb/4MxUihUfeltPvYfbyT4ANjDGxoFgzRVkfwgOJiic7K1UmJgAOCbiM9r8w7tRGquXo2SYB4r5+rTc=
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=<bogorodskiy@gmail.com> (p=none dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1766912662415479.60219484491347;
 Sun, 28 Dec 2025 01:04:22 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 993)
	id 304363F809; Sun, 28 Dec 2025 04:04:21 -0500 (EST)
Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245])
	by lists.libvirt.org (Postfix) with ESMTP id 2F71E41ACD;
	Sun, 28 Dec 2025 03:57:12 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 993)
	id 41F5F3FC5D; 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 CD4E13FBCA
	for <devel@lists.libvirt.org>; Sun, 28 Dec 2025 03:54:43 -0500 (EST)
Received: by mail-ej1-f47.google.com with SMTP id
 a640c23a62f3a-b802d5e9f06so1054318866b.1
        for <devel@lists.libvirt.org>; Sun, 28 Dec 2025 00:54:43 -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.37
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Sun, 28 Dec 2025 00:54:37 -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=1766912082; x=1767516882;
 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=uDJT9mULnLx7/9k2iMKp1H7BFUdpNnxrsU7ypWnJ0+k=;
        b=m/b7/K57m40vL4jpERKKP/XlwL/bqDcOxySgX5PdKLqWTdOZO11zGvGDmo30x8ztM4
         xl0gyULJmwO/rq/nAJHaQyXiDMzCHZe7t2VzOLRXrlseoXTXJJS5Qf6nWw2VTJUt/T0D
         KNFh4OgpwNdbSYn2bnkES3R7o3dyR52QaIxct4njsmyHVfN7JGn1aL1LxKSAJmuhaZGx
         YtwfaPrRT33OBC+KNvFXNWPK4vhHejgTDEVAgPva8tO4OPmBASlKcoJJDsQwMLeC/U+y
         /DXc2Wqu75En/bSvncRi9YiH3Sd+XtWbVWHVB7bwQxMv9w052zlPrsC2jJYILeG+AjVr
         pZmQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1766912082; x=1767516882;
        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=uDJT9mULnLx7/9k2iMKp1H7BFUdpNnxrsU7ypWnJ0+k=;
        b=K/6daC9nnMykG/8jNMGeJp7hteAwqiRDY9RhjI6oNNwvP6cnEx/jV2V8Nu+eAMxJD2
         gi6GzPG0tvPQYyDFECU3sVzYVqT/dG97sBYRPZFQghStm7eNvtiu1jRyppIUOZgQnTfb
         +AMmcz0Q4ej2LUzxAQvrgQJXThyVAL2FrZzDhj1a10IwtcxrtZVx9gzSBomC6wbul1Zr
         u+ZXj8p9U1SCv9GFBcaXuBqEvlaq83qWslzaj+S8CVdlnNy3xaNUV7iXcN2EUPse4Edi
         Qkg4t9PDP+t3wKansxrqoGpLdFbqCOhb6gMzVp03XH1b+DAEcup/TezTio0/dy7+CYNj
         ogUw==
X-Gm-Message-State: AOJu0Ywh7i+VzZtaqbFbexqKJ6JxByiUoiihlA+qAP6JSCP3+vTmljL4
	sQExe+ZMD+pCdZqvfYR0stp+Ectpmbsa/RpKshg/LpauSfGViejKtaPWMOar7ZQn
X-Gm-Gg: AY/fxX4iCPdwgVsc4WT9viB2cEs88c6jMQqnIWw188e50n7RQpJsBJGtn5kFgeySkqe
	mtWYfP5sLMxD6EFVPD1aGGAnseXCIvyoZSQl/ovB+0EBJ3zPkMFno+Qd94Gi7hYhkOd54cDAdeO
	lIcxQ4GmYH7tawvufIUJIY7ZDlCf/x3JvgqT2+kPmRtTENZeal2goGpU6MScrXmblLWnS3DgnaL
	hbcATD/OCqAteYOaPwQcm3sXDSvFmYnpYuk+zxQOdEJcrCZ6E1CKxBv/gxlOlQQY5qxBYvix7Gs
	7OKFMjfCNoNM+r1DWNQIzcWnKvj8+V2RTq7i7ntXnFDST+i8B7VjwQtICJKlKE8TOrMN3lOJNPG
	Zc8eTkXKaI6X+g0Lh/BjyhG+sI9NBzkIHDJKTiH/sQjXO0MGnKX2dvOZLF33kJ8dgGj3vWDT+mP
	04lDE7/kgHd484A0hPoMCUF4pkxS/az/oDVH/egHeN3MJYDIGa/Q==
X-Google-Smtp-Source: 
 AGHT+IGtjToKCG5nGS2UgKtkaDfv2T1DNURJcc/0JcUFlJ4QOuEIOtDhLGkxqcmuXpHXDspB44BF/w==
X-Received: by 2002:a17:907:7f07:b0:b6c:38d9:6935 with SMTP id
 a640c23a62f3a-b8036f6291emr2598996066b.24.1766912078563;
        Sun, 28 Dec 2025 00:54:38 -0800 (PST)
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
To: devel@lists.libvirt.org
Subject: [PATCH 2/9] bhyve: tests: support arch-dependent tests
Date: Sun, 28 Dec 2025 09:51:05 +0100
Message-ID: <20251228085112.81805-3-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: LCMMYDKDLU2NHMTP3KOMC237XC6RFMWC
X-Message-ID-Hash: LCMMYDKDLU2NHMTP3KOMC237XC6RFMWC
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 <bogorodskiy@gmail.com>
X-Mailman-Version: 3.3.10
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/LCMMYDKDLU2NHMTP3KOMC237XC6RFMWC/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Owner: <mailto:devel-owner@lists.libvirt.org>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
X-ZohoMail-DKIM: pass (identity @gmail.com)
X-ZM-MESSAGEID: 1766912663245158500
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
---
 .../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
 .../{ =3D> x86_64}/bhyvexml2argv-4-consoles.xml |  0
 .../{ =3D> x86_64}/bhyvexml2argv-acpiapic.args  |  0
 .../bhyvexml2argv-acpiapic.ldargs             |  0
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-base.args      |  0
 .../{ =3D> x86_64}/bhyvexml2argv-base.ldargs    |  0
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-console.args   |  0
 .../{ =3D> x86_64}/bhyvexml2argv-console.ldargs |  0
 .../{ =3D> 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
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-fs-9p.args     |  0
 .../{ =3D> x86_64}/bhyvexml2argv-fs-9p.ldargs   |  0
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-localtime.args |  0
 .../bhyvexml2argv-localtime.ldargs            |  0
 .../{ =3D> x86_64}/bhyvexml2argv-localtime.xml  |  0
 .../{ =3D> x86_64}/bhyvexml2argv-macaddr.args   |  0
 .../{ =3D> x86_64}/bhyvexml2argv-macaddr.ldargs |  0
 .../{ =3D> x86_64}/bhyvexml2argv-macaddr.xml    |  0
 .../{ =3D> x86_64}/bhyvexml2argv-metadata.xml   |  0
 .../{ =3D> x86_64}/bhyvexml2argv-msrs.args      |  0
 .../{ =3D> x86_64}/bhyvexml2argv-msrs.ldargs    |  0
 .../{ =3D> x86_64}/bhyvexml2argv-msrs.xml       |  0
 .../{ =3D> x86_64}/bhyvexml2argv-net-e1000.args |  0
 .../bhyvexml2argv-net-e1000.ldargs            |  0
 .../{ =3D> x86_64}/bhyvexml2argv-net-e1000.xml  |  0
 .../{ =3D> x86_64}/bhyvexml2argv-nvme.args      |  0
 .../{ =3D> x86_64}/bhyvexml2argv-nvme.ldargs    |  0
 .../{ =3D> x86_64}/bhyvexml2argv-nvme.xml       |  0
 .../bhyvexml2argv-passthru-multiple-devs.args |  0
 ...hyvexml2argv-passthru-multiple-devs.ldargs |  0
 .../bhyvexml2argv-passthru-multiple-devs.xml  |  0
 .../{ =3D> x86_64}/bhyvexml2argv-passthru.args  |  0
 .../bhyvexml2argv-passthru.ldargs             |  0
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-serial-tcp.xml |  0
 .../{ =3D> x86_64}/bhyvexml2argv-serial.args    |  0
 .../{ =3D> x86_64}/bhyvexml2argv-serial.ldargs  |  0
 .../{ =3D> x86_64}/bhyvexml2argv-serial.xml     |  0
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-slirp.args     |  0
 .../{ =3D> x86_64}/bhyvexml2argv-slirp.ldargs   |  0
 .../{ =3D> x86_64}/bhyvexml2argv-slirp.xml      |  0
 .../{ =3D> x86_64}/bhyvexml2argv-sound.args     |  0
 .../{ =3D> x86_64}/bhyvexml2argv-sound.ldargs   |  0
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-uefi-nvram.xml |  0
 .../{ =3D> x86_64}/bhyvexml2argv-uefi.args      |  0
 .../{ =3D> x86_64}/bhyvexml2argv-uefi.ldargs    |  0
 .../{ =3D> 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
 .../{ =3D> 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
 .../{ =3D> x86_64}/bhyvexml2argv-vnc-wait.args  |  0
 .../bhyvexml2argv-vnc-wait.ldargs             |  0
 .../{ =3D> x86_64}/bhyvexml2argv-vnc-wait.xml   |  0
 .../{ =3D> x86_64}/bhyvexml2argv-vnc.args       |  0
 .../{ =3D> x86_64}/bhyvexml2argv-vnc.ldargs     |  0
 .../{ =3D> x86_64}/bhyvexml2argv-vnc.xml        |  0
 .../{ =3D> x86_64}/bhyvexml2argv-wired.args     |  0
 .../{ =3D> x86_64}/bhyvexml2argv-wired.ldargs   |  0
 .../{ =3D> 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 =3D=
> aarch64/bhyvexml2argv-base.ldargs} (100%)
 create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.xml
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-2-nvme-2-contr=
ollers.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-2-nvme-2-contr=
ollers.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-2-nvme-2-contr=
ollers.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-2-nvme-same-co=
ntroller.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-2-nvme-same-co=
ntroller.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-2-nvme-same-co=
ntroller.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-4-consoles.arg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-4-consoles.lda=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-4-consoles.xml=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-acpiapic.args =
(100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-acpiapic.ldarg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-acpiapic.xml (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-isa-contr=
oller-on-slot-1.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-isa-contr=
oller-on-slot-1.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-isa-contr=
oller-on-slot-1.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-isa-contr=
oller-on-slot-31.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-isa-contr=
oller-on-slot-31.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-isa-contr=
oller-on-slot-31.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-more-than=
-32-sata-disks.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-more-than=
-32-sata-disks.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-more-than=
-32-sata-disks.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-multiple-=
sata-disks.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-multiple-=
sata-disks.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-multiple-=
sata-disks.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-multiple-=
virtio-disks.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-multiple-=
virtio-disks.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-multiple-=
virtio-disks.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
more-than-32-sata-disks.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
multiple-sata-disks.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
multiple-sata-disks.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
multiple-sata-disks.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
single-sata-disk.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
single-sata-disk.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-no32devs-=
single-sata-disk.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-non-isa-c=
ontroller-on-slot-1.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-non-isa-c=
ontroller-on-slot-1.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-non-isa-c=
ontroller-on-slot-1.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-single-sa=
ta-disk.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-single-sa=
ta-disk.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-single-sa=
ta-disk.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-single-vi=
rtio-disk.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-single-vi=
rtio-disk.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-addr-single-vi=
rtio-disk.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-base.args (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-base.ldargs (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-base.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order1.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order1.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order1.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order2.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order3.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order3.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order3.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order4.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-boot=
order5.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-expl=
icitargs.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-expl=
icitargs.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-expl=
icitargs.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-time=
out.args (100%)
 create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-=
timeout.ldargs
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-bhyveload-time=
out.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-commandline.ar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-commandline.ld=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-commandline.xm=
l (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-console-master=
-slave-not-specified.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-console-master=
-slave-not-specified.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-console-master=
-slave-not-specified.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-console.args (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-console.ldargs=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-console.xml (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-cputopology-nv=
cpu-mismatch.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-cputopology.ar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-cputopology.ld=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-cputopology.xm=
l (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-custom-loader.=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-custom-loader.=
ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-custom-loader.=
xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom-gru=
b.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom-gru=
b.devmap (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom-gru=
b.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom-gru=
b.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom.arg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom.lda=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-cdrom.xml=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-virtio-qu=
eue-opts.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-virtio-ro=
tation-rate.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-virtio.ar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-virtio.ld=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-disk-virtio.xm=
l (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-firmware-efi.a=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-firmware-efi.l=
dargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-firmware-efi.x=
ml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p-readonly=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p-readonly=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p-readonly=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p-unsuppor=
ted-accessmode.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p-unsuppor=
ted-driver.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p-unsuppor=
ted-type.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p.args (10=
0%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p.ldargs (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-fs-9p.xml (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
.devmap (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
2.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
2.devmap (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
2.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-bootorder=
2.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-defaults.=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-defaults.=
devmap (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-defaults.=
ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-grub-defaults.=
xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-input-xhci-tab=
let.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-input-xhci-tab=
let.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-input-xhci-tab=
let.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-isa-controller=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-isa-controller=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-isa-controller=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-isa-multiple-c=
ontrollers.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-localtime.args=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-localtime.ldar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-localtime.xml =
(100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-macaddr.args (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-macaddr.ldargs=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-macaddr.xml (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-metadata.xml (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-msrs.args (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-msrs.ldargs (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-msrs.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-net-e1000.args=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-net-e1000.ldar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-net-e1000.xml =
(100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-nvme.args (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-nvme.ldargs (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-nvme.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-passthru-multi=
ple-devs.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-passthru-multi=
ple-devs.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-passthru-multi=
ple-devs.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-passthru.args =
(100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-passthru.ldarg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-passthru.xml (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-sata-rotation-=
rate.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-sata-rotation-=
rate.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-sata-rotation-=
rate.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub-no=
cons.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub-no=
cons.devmap (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub-no=
cons.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub-no=
cons.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub.ar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub.de=
vmap (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub.ld=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-grub.xm=
l (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-invalid=
-port.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-invalid=
-port.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-invalid=
-port.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-tcp.arg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-tcp.lda=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial-tcp.xml=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial.args (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial.ldargs =
(100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-serial.xml (10=
0%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp-ip.xml (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp-mac-addr=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp-mac-addr=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp-mac-addr=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp.args (10=
0%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp.ldargs (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-slirp.xml (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-sound.args (10=
0%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-sound.ldargs (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-sound.xml (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram-tem=
plate-and-source-set.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram-tem=
plate-and-source-set.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram-tem=
plate-and-source-set.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram-tem=
plate-set.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram-tem=
plate-set.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram-tem=
plate-set.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram.arg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram.lda=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi-nvram.xml=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi.args (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi.ldargs (1=
00%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-uefi.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-virtio-rnd-bac=
kend-builtin.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-virtio-rnd-bac=
kend-random-non-default-file.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-virtio-rnd-tra=
nsitional.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-virtio-rnd.arg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-virtio-rnd.lda=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-virtio-rnd.xml=
 (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-autoport.a=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-autoport.l=
dargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-autoport.x=
ml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-password-c=
omma.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-password.a=
rgs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-password.l=
dargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-password.x=
ml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-resolution=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-resolution=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-resolution=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-io=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-io=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-io=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-of=
f.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-of=
f.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-of=
f.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-on=
.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-on=
.ldargs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-vgaconf-on=
.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-wait-no.ar=
gs (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-wait-no.ld=
args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-wait-no.xm=
l (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-wait.args =
(100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-wait.ldarg=
s (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc-wait.xml (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc.args (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc.ldargs (10=
0%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-vnc.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-wired.args (10=
0%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-wired.ldargs (=
100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-wired.xml (100=
%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-xhci-multiple-=
controllers.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-xhci-multiple-=
devs.xml (100%)
 rename tests/bhyvexml2argvdata/{ =3D> x86_64}/bhyvexml2argv-xhci-no-devs.x=
ml (100%)

diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args b/test=
s/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=3D52: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=3D'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=3D'file'>
+      <driver name=3D'file' type=3D'raw'/>
+      <source file=3D'/tmp/freebsd.img'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'2' unit=
=3D'0'/>
+    </disk>
+    <interface type=3D'bridge'>
+      <mac address=3D'52:54:00:b9:94:02'/>
+      <model type=3D'virtio'/>
+      <source bridge=3D"virbr0"/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.arg=
s 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.lda=
rgs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-2-controllers.lda=
rgs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-2-controllers.ldar=
gs
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.a=
rgs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller.a=
rgs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.ar=
gs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controll=
er.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.l=
dargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controller=
.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.ld=
args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-2-nvme-same-controll=
er.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.x=
ml 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-controll=
er.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/test=
s/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/b=
hyvexml2argvdata/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/bh=
yvexml2argvdata/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/bhy=
vexml2argvdata/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-s=
lot-1.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controll=
er-on-slot-1.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl=
ot-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-s=
lot-1.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-contro=
ller-on-slot-1.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl=
ot-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-s=
lot-1.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controlle=
r-on-slot-1.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl=
ot-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-s=
lot-31.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-control=
ler-on-slot-31.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl=
ot-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-s=
lot-31.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-contr=
oller-on-slot-31.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl=
ot-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-s=
lot-31.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-isa-controll=
er-on-slot-31.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-sl=
ot-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-d=
isks.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-di=
sks.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sa=
ta-disks.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-d=
isks.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-3=
2-sata-disks.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-di=
sks.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sa=
ta-disks.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-d=
isks.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-s=
ata-disks.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-di=
sks.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-more-than-32-sa=
ta-disks.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks=
.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-dis=
ks.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.=
args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-d=
isks.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks=
.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-d=
isks.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.=
ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-d=
isks.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks=
.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-disk=
s.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.=
xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-sata-d=
isks.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-dis=
ks.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio=
-disks.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disk=
s.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio=
-disks.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-dis=
ks.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virt=
io-disks.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disk=
s.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio=
-disks.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-dis=
ks.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-multiple-virtio-=
disks.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disk=
s.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-no32d=
evs-more-than-32-sata-disks.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-more-than-3=
2-sata-disks.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-more-t=
han-32-sata-disks.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-s=
ata-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-sa=
ta-disks.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multip=
le-sata-disks.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-s=
ata-disks.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32de=
vs-multiple-sata-disks.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sa=
ta-disks.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multip=
le-sata-disks.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-s=
ata-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-sa=
ta-disks.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-multip=
le-sata-disks.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sat=
a-disk.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-si=
ngle-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-sat=
a-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-sat=
a-disk.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-no32devs-sin=
gle-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-o=
n-slot-1.args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-control=
ler-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-is=
a-controller-on-slot-1.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-o=
n-slot-1.ldargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-control=
ler-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-c=
ontroller-on-slot-1.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-o=
n-slot-1.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-non-isa-control=
ler-on-slot-1.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ar=
gs 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-dis=
k.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ld=
args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-disk.l=
dargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.lda=
rgs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-sata-dis=
k.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.xm=
l 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-dis=
k.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.a=
rgs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-d=
isk.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.=
ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-di=
sk.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.l=
dargs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-d=
isk.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.x=
ml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-addr-single-virtio-d=
isk.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvex=
ml2argvdata/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/bhyv=
exml2argvdata/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/bhyvexm=
l2argvdata/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.ldar=
gs 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.arg=
s 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.lda=
rgs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.lda=
rgs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldar=
gs
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.arg=
s 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.lda=
rgs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.lda=
rgs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldar=
gs
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.a=
rgs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs.a=
rgs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ar=
gs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitar=
gs.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.l=
dargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitargs=
.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ld=
args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-explicitar=
gs.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.x=
ml 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-explicitar=
gs.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.ar=
gs
diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout=
.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-timeout.ld=
args
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/tes=
ts/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-mast=
er-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-ma=
ster-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-maste=
r-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/bhy=
vexml2argvdata/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/b=
hyvexml2argvdata/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/bhyv=
exml2argvdata/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-mismat=
ch.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology-nvcpu-mis=
match.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-cputopology-nvcpu-mismatc=
h.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-cputopology-nvcpu-mi=
smatch.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/tes=
ts/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/tes=
ts/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/t=
ests/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/test=
s/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/t=
ests/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.devm=
ap
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.ldar=
gs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml b/te=
sts/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/test=
s/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/b=
hyvexml2argvdata/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.x=
ml 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-op=
ts.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio-rotation-rat=
e.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-virtio-rotation-r=
ate.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/tes=
ts/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/test=
s/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/te=
sts/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/te=
sts/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/tes=
ts/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-access=
mode.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-a=
ccessmode.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessm=
ode.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-ac=
cessmode.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver=
.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-drive=
r.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.=
xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-fs-9p-unsupported-dr=
iver.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-type.x=
ml 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-ty=
pe.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyve=
xml2argvdata/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/bhy=
vexml2argvdata/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/bhyvex=
ml2argvdata/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/te=
sts/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/tes=
ts/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/t=
ests/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.devm=
ap
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.ldar=
gs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml b/te=
sts/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/tes=
ts/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/t=
ests/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/t=
ests/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/test=
s/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.ar=
gs
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.ld=
args
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/te=
sts/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/tes=
ts/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-controller=
s.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-isa-multiple-controllers.=
xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-isa-multiple-control=
lers.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/b=
hyvexml2argvdata/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/bh=
yvexml2argvdata/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/bhy=
vexml2argvdata/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/b=
hyvexml2argvdata/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/bhyv=
exml2argvdata/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/bhy=
vexml2argvdata/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/bhyvex=
ml2argvdata/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/bhyv=
exml2argvdata/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/bhyvexm=
l2argvdata/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/b=
hyvexml2argvdata/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/bh=
yvexml2argvdata/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/bhyvex=
ml2argvdata/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/bhyv=
exml2argvdata/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/bhyvexm=
l2argvdata/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.a=
rgs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs.a=
rgs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.ar=
gs
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-de=
vs.args
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.l=
dargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-devs=
.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.ld=
args
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-passthru-multiple-de=
vs.ldargs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru-multiple-devs.x=
ml 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-de=
vs.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-passthru.args b/tests/bh=
yvexml2argvdata/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/bhy=
vexml2argvdata/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.a=
rgs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sata-rotation-rate.ldarg=
s 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.l=
dargs
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.x=
ml
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.a=
rgs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.devma=
p 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.d=
evmap
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldarg=
s 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.l=
dargs
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.x=
ml
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/tes=
ts/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/tes=
ts/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.ldar=
gs 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/test=
s/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/b=
hyvexml2argvdata/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/bhyv=
exml2argvdata/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/bh=
yvexml2argvdata/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/bhyve=
xml2argvdata/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/bhy=
vexml2argvdata/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/te=
sts/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/tes=
ts/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/bhyve=
xml2argvdata/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/bhy=
vexml2argvdata/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/bhyvex=
ml2argvdata/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/bhyve=
xml2argvdata/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/bhy=
vexml2argvdata/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/bhyvex=
ml2argvdata/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-t=
emplate-and-source-set.args
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-s=
ource-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-s=
ource-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-te=
mplate-and-source-set.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-s=
ource-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.a=
rgs
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-s=
et.ldargs
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.l=
dargs
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.x=
ml
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/test=
s/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/b=
hyvexml2argvdata/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/bhyvex=
ml2argvdata/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/bhyv=
exml2argvdata/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/bhyvexm=
l2argvdata/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-built=
in.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-backend-bu=
iltin.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-builti=
n.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-backend-b=
uiltin.xml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-rnd-backend-rando=
m-non-default-file.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virti=
o-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-r=
andom-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.x=
ml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-virtio-rnd-transitio=
nal.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/test=
s/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/b=
hyvexml2argvdata/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/test=
s/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/te=
sts/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.x=
ml
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args b/test=
s/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/te=
sts/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/te=
sts/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/tes=
ts/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/te=
sts/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/tes=
ts/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/t=
ests/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.ldar=
gs
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml b/te=
sts/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/te=
sts/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/tes=
ts/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/tes=
ts/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/bh=
yvexml2argvdata/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/bhy=
vexml2argvdata/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/bhyvexm=
l2argvdata/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/bhyve=
xml2argvdata/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/bhyvexml=
2argvdata/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/bhyve=
xml2argvdata/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/bhy=
vexml2argvdata/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/bhyvex=
ml2argvdata/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-controller=
s.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-multiple-controll=
ers.xml
similarity index 100%
rename from tests/bhyvexml2argvdata/bhyvexml2argv-xhci-multiple-controllers=
.xml
rename to tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-xhci-multiple-contro=
llers.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.x=
ml
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 =3D NULL;
     g_autofree char *ldargs =3D NULL;
     g_autofree char *dmargs =3D NULL;
+    const char *arch =3D virArchToString(virArchFromHost());
=20
-    xml =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml",
-                          abs_srcdir, info->name);
-    args =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.args",
-                           abs_srcdir, info->name);
-    ldargs =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.ldar=
gs",
-                             abs_srcdir, info->name);
-    dmargs =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.devm=
ap",
-                             abs_srcdir, info->name);
+    xml =3D g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.xml",
+                          abs_srcdir, arch, info->name);
+    args =3D g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.arg=
s",
+                           abs_srcdir, arch, info->name);
+    ldargs =3D g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.l=
dargs",
+                             abs_srcdir, arch, info->name);
+    dmargs =3D g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.d=
evmap",
+                             abs_srcdir, arch, info->name);
=20
     return testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flag=
s);
 }
@@ -328,6 +329,12 @@ mymain(void)
     driver.config->bhyveloadTimeoutKill =3D 20;
     DO_TEST("bhyveload-timeout");
=20
+    /* arm64 tests */
+    virTestSetHostArch(VIR_ARCH_AARCH64);
+    driver.caps =3D 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 =3D info->flags & FLAG_IS_DIFFERENT;
     int ret =3D -1;
=20
-    xml_in =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml",
+    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);
--=20
2.51.2