From nobody Thu Jan 8 12:09:44 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=1766912230; cv=none; d=zohomail.com; s=zohoarc; b=N2KCNsA0+5vZhGIoiAdcBl+JKI2RJJBmEE0Xfn4aQZ7ICSjRiqIGQ/1GKZTaZriS0g9nJA4tds3l9pm3cAJbhysG65FSRLh5yUXFSnNJ/htofSftGKRZh7ondcdnDrB9Dx4pRYAQ4zSljq4iuZN5lp9PBvZYQTact8Lw9Ds9GtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912230; 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=icXFxI/AgbhENNgWnsybY9OH96Qc3wCh54r+WoglF14=; b=A5DgYZ7x/dOMkMc0XY/yIwMPJVEgIDv47lE99CeeBn8hNSbOtyCQH6KjjdUwrrpUB5IeDYEqaPHV7U1+L9WYsd2o1zU35sdZn4gPcSBYC67/u791sOSI0/3UwCRZW5sOX+3CDtibATis5tP/7t0J+shYTIwT3Z/IotAgnAG6/ks= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17669122305498.453536648561908; Sun, 28 Dec 2025 00:57:10 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 140A641A9B; Sun, 28 Dec 2025 03:57:08 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 121924183D; Sun, 28 Dec 2025 03:56:32 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id D04203FBCB; Sun, 28 Dec 2025 03:54:39 -0500 (EST) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (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 244FC3FBC4 for ; Sun, 28 Dec 2025 03:54:39 -0500 (EST) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-b734fcbf1e3so1696260766b.3 for ; Sun, 28 Dec 2025 00:54:39 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:36 -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=1766912077; x=1767516877; 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=icXFxI/AgbhENNgWnsybY9OH96Qc3wCh54r+WoglF14=; b=NJE/GXLlipObIZwY2w7WGJSJUta7t+aQOmbClCBE6IhnpcGIxpjdHAcevlyHWuGYyM 3xN9NOFonNAal0XU+rHl8wxSvhTYhMZLqP4JRXSiXLiVVf+TCc/bRuRbiWelbmiDNR2F di/40ZGIIdyzgNoG4m5MZSrc9smaMVciDm4pi97VAHV4a8VMzI6KEEVLGNWG4bFCnLem efsYMZ1HvSHsw0PVN2yndax5xhqfI/D2FPLkVH35/h4MG7VzRTSYP8tCxV3c2XbfuFPz I8FbIkOzlavjqs/7BTfiaKGs70IQerapPRT8hN0AqYPjrfIuoG+cOojzREbV/HWc7HVV gYsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912077; x=1767516877; 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=icXFxI/AgbhENNgWnsybY9OH96Qc3wCh54r+WoglF14=; b=BEHgRjgjzfWpUaSlpcFcE1+1YLNt6IM1asm5h2I7cWjvFzGW0LVXnxz8WOG4cmY42q RMn8oOUb/gQJGjfWVYogz0TihtAwJd3T0ZPTVyqFHDsLeyL0oNuNKO56qbxYNpttNwEt xLaSt6xJ9STmzXae8YwzmcUgom93If7pmGWisgwp4WgAwQifn8ArXPnDVLf5Zed5j9/T xtp4sw2ymm09tL3VBCJj1B9YmdWd1okEa0ShunQ38j2sjem2jmd++U3jya9zu6icBVlf 37rV8fmpbhqi30ANl+hdZVAqpVyWtGvBNyDPTLUi3bA6DYXZZ6y0vrGkEzvChy6Eqhoy XezA== X-Gm-Message-State: AOJu0Yw8g1u2Nih1FODae/t3hsKs2K9CqEy+xHa664Om+i/5/8WzoPg5 FFA60L8XGe2ys1pmiEMhovNf3nXdOBaPuLaCoCEtDTg4Z2T3H5TqCjiKQ2stChC4 X-Gm-Gg: AY/fxX5mGFGNdksFyaR3SvauH79MCvZhfnAFln1SiPaMAM8EZhw7TzrsQFWXt+gP7MJ fGD8J5MWT5s2tcXrzq7PQhHr2JK2frgTkO6f4RlrOQYHkRECWSLG3a+FuTchsT4dganTNkokheH ceumq8LZxldf2evOfj10liqcvm4mO2Hcq0nxk0fPLbxrkvLikdqezuZDT1qpzmrSkLBt/0GpOe7 0Rv7kzN0VqdnuwNwD9AYg9s9acEGsFvdZ8Ph6QG1A0vaRuZe7uq4rIRClP2mlWMW3fKNUKvRVPa e/TtyGe4zj9x5akS+CEh6c7hFXwl+LWnQx0f60VLkeW8hH0a3i/5kYzXOHsUdTkqj0P7CpGvDiZ amrhLPmVCTb7hBpLu94FPpHFsRlMpzCRGLttfJgNy8T+6KR3nDYEtTcOzCaRcVdQGK62BVHwTaR S81k1Gu6IJdS3DgrYwMerpLzYz6SSKgQzWkCsVretEFcgAbuMVlg== X-Google-Smtp-Source: AGHT+IEUISu+DGRAeoUUkMyflsPX80bSI5CxP6xP5jRkc1ytdFadb6Q1A+D3hvpG+NgGAzkAGKK0ag== X-Received: by 2002:a17:907:7f05:b0:b72:9961:dc04 with SMTP id a640c23a62f3a-b8036f86950mr3119184566b.28.1766912077215; Sun, 28 Dec 2025 00:54:37 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 1/9] bhyve: capabilities: fix for arm64 Date: Sun, 28 Dec 2025 09:51:04 +0100 Message-ID: <20251228085112.81805-2-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: SGHOBEAO2V7O3JQDAIQN2QTE5NBKLRYM X-Message-ID-Hash: SGHOBEAO2V7O3JQDAIQN2QTE5NBKLRYM X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912233119158500 Content-Type: text/plain; charset="utf-8" Currently, guest capabilities have VIR_ARCH_X86_64 hard-coded for supported guest. As bhyve supports amd64 and arm64 hosts, and guests' arch must match host's arch, reporting VIR_ARCH_X86_64 for arm64 is wrong. Set supported guest arch to the same value as the host arch. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_capabilities.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 0585fff8e9..38959cc271 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -46,13 +46,14 @@ virBhyveCapsBuild(void) { virCaps *caps; virCapsGuest *guest; + virArch hostarch =3D virArchFromHost(); =20 - if ((caps =3D virCapabilitiesNew(virArchFromHost(), + if ((caps =3D virCapabilitiesNew(hostarch, false, false)) =3D=3D NULL) return NULL; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_X86_64, "bhyve", + hostarch, "bhyve", NULL, 0, NULL); =20 virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_BHYVE, --=20 2.51.2 From nobody Thu Jan 8 12:09:44 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= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 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 ; Sun, 28 Dec 2025 03:54:43 -0500 (EST) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b802d5e9f06so1054318866b.1 for ; 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 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 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912663245158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- .../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 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + 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 From nobody Thu Jan 8 12:09:44 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=1766912269; cv=none; d=zohomail.com; s=zohoarc; b=icpQx8Cz7gtGhQqUig3nnP/Td7ihyLS++/yod/c5WDiedIRsyH4XLZ3LWrxMHQxR25ujB6VPUmEUx2ic5mLf6jmi273yYqmBCq+muY+g4IvgNrLmmlxoph1OySEVQs1Y8nP9+7F6EUnm9Fm/w8osPgO1cbaw2OyMqlWNrTv8d7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912269; 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=c3xbQFpBCW8XFQ+iSySI90yro1LmVJGs+iUjCsDFvwU=; b=E2My/PF0VpYU/H7BVlhoMHzXD/kWji8KulGUJwnVaYhaNyKHgVC4KWHCEWqdQBYyKgJG+0HnzZc7z74sPMmIukUf+M7xUX6Nu0JOb7d6TYw+qjVxL7+Dr64zL7iIlYi5RUGCSYLWfDZy6Xeyk38VPKqlTX1Kc89yHWeA4S3lupA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912269564912.3804717447473; Sun, 28 Dec 2025 00:57:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id E779E4193F; Sun, 28 Dec 2025 03:57:48 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 25607418A2; Sun, 28 Dec 2025 03:56:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3AA583FBCA; Sun, 28 Dec 2025 03:54:42 -0500 (EST) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 8D0883FBC4 for ; Sun, 28 Dec 2025 03:54:41 -0500 (EST) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-64b4b35c812so11398887a12.0 for ; Sun, 28 Dec 2025 00:54:41 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:38 -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=1766912080; x=1767516880; 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=c3xbQFpBCW8XFQ+iSySI90yro1LmVJGs+iUjCsDFvwU=; b=RMBeD4nNKYRlPjvrhHwmbqvJFSzclIR8667tc1i3QNgdj2X7e1TNDkrbjEb0xRKkt8 ePAPysgBUqyjFWWoFrelBa4NPluzwzyb89FHaAQF3MMhCWNGhuNE+Y74sMlpB6cL69wm 6LyddoiI2PMkXgViHlSFpYtmW+E1wkWR0LM40sBBNeYTxr7ILAw4MKRUT+DgWvddUC/e iRZRNfj4fZOJiG1uzruukKI1s0/CJhdnjc9YiOxeq2cAkwa72VoNHtfqizaWKAoOtVTi k9KhhSa9Yabvt9uSl70lFNI3EE0twUi59vOJc+Tk8ZVMHHZgqiCxmSJQCCd7pluLdQyE SqCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912080; x=1767516880; 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=c3xbQFpBCW8XFQ+iSySI90yro1LmVJGs+iUjCsDFvwU=; b=WI+S3Pt0ZDSWMSTMzlbjhA2bMeFQpxjKKmsoayFYlf0S5r2UHkd9sc6PnQQ3/kO3HJ Pq+42jnRQhswfbCjeZrh+ZWbu+N1ZH5/GjKKlBQKCVhFvN5M+UqKg5/P9w7tPyaNNeSY GLqF4QE/Otdn1OSbvZRf8uvWRAQQiG1dkgfTZeatOaC+rMcc5m1WNE54WAn20ZXJCZ1m JYs0JKzoaEZTvOS4upf1Mb2BKuXfmUlNPgWMMCfyXiio16UfVvQCUGwMoqwWUMtJCbdw N4U+pYm1L1/C/Y4Uu42SYe5hhqebzmvnmKrWpylYAoFLiPgUTNq7Ie/ScBvaKr2sNA3F HCOQ== X-Gm-Message-State: AOJu0YztcoiSvVjCbs1Z8tILL67P9wzWHS5T76Vf0lcxK675NIXAe71I iVKGHKVr5JyNw7lZ2e2NnZlJQfKxdSMtwaiMMs8F2uTMaQnu8UfPtWh/X/HCRjUc X-Gm-Gg: AY/fxX7ykUpmxyJyaod57AtY5lhd5kOjgyzIGKXH3v6mi8xPd7U6ZlisCyQ0RKMBBmp f2n0szbLTllavkHZAZ9VqYVrHKgGmCD05j5RYtPniSlMZ2W+RkzV2b+pZ5Qs5NfelwEH8rl2QH1 3nMFqVvViQb2T05Pd3zShzcPX4TC+LObFCk8s4Hp/EWo5sGQxAPR2iQsbciyeVQusozpiOHCfhG 1mu9qgZlMhqYN71FfLLt9YOKADoZBnnn+QjA7qK+d6BKhN85n+45eE6GoDNO8LLzOzTGREWkh9D Ek+zlBkrMz2vRi8vKhJpPsM52WvAwUkzDwd49XhGx5A8VTEWu3C3ogXWaXfNji7SzhFdIRF7/Ip t5zKiEiE4i7g3KjC5u9isiwANFz42l8UfVP3uH7e1J2GlkMhVrAt9o7Fr2Y45kVKUNFt9GKKuUC ofo2BOaNxvqh22pLWdLrAGJ6IqpCNjd2YBwNswMh9p78XU2a3fBA== X-Google-Smtp-Source: AGHT+IEPB4l6rJzerXLzxv2XhWACl3zyqRGkYP/kIFMDzY0XOYYtSF/Zm06gntot+eSvAHpDh/55+A== X-Received: by 2002:a17:906:ef03:b0:b83:1341:635d with SMTP id a640c23a62f3a-b83134172f4mr1131731966b.0.1766912079484; Sun, 28 Dec 2025 00:54:39 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 3/9] bhyve: domain: require ISA controller on x86_64 only Date: Sun, 28 Dec 2025 09:51:06 +0100 Message-ID: <20251228085112.81805-4-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: TGWI7HH5VC3FMMZDG33DQJLZM2D5CB2I X-Message-ID-Hash: TGWI7HH5VC3FMMZDG33DQJLZM2D5CB2I X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912271835158500 Content-Type: text/plain; charset="utf-8" ISA controller is not used by the ARM guests. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index b9f9761b43..0c33a67ca6 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -62,6 +62,9 @@ virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDat= aCallbacks =3D { static bool bhyveDomainDefNeedsISAController(virDomainDef *def) { + if (!ARCH_IS_X86(def->os.arch)) + return false; + if (def->os.bootloader =3D=3D NULL && def->os.loader) return true; =20 --=20 2.51.2 From nobody Thu Jan 8 12:09:44 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=1766912323; cv=none; d=zohomail.com; s=zohoarc; b=iRpDz1pv2HJJM3JDKO9eusXeDq6XyN4xCZwlua2R2E0JZFA8T6MzP3xGjim5Z3Hdml1hwnFRZcQDOoBC155kfS/b9KZrHL1LPyjVJp53ZCgEXPWwfQN2B7t2CWOQYcvfesZAmKzbdchMKotq+/qQi89whM6bILZYbcTBPZeDmtI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912323; 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=3KOOf+PvVr8dMnJ3zzgwztVlE9tcu0CBGoY+CM1NiXY=; b=DmfjyQl6XipswgzwiTEN0VDSHOALsxs8xx3Iiy53K9Hd3UA5vjoKklV2Tv5ssMYX2pWKXsP4b87Qyalu6p+RhfkTSkE4eBr+H47PA0piJTGWhHUa/qHVBLsj03oc9GA90XACwMW/tX87Jhj7twsRNfV5w6nIZzStXtPnZnT7nts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912323917543.1070415391001; Sun, 28 Dec 2025 00:58:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0D2E34186E; Sun, 28 Dec 2025 03:58:42 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 3FD7D41928; Sun, 28 Dec 2025 03:56:48 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 817093F34C; Sun, 28 Dec 2025 03:54:43 -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 8578A3F34C for ; Sun, 28 Dec 2025 03:54:42 -0500 (EST) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b79af62d36bso1418314966b.3 for ; Sun, 28 Dec 2025 00:54:42 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:39 -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=1766912081; x=1767516881; 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=3KOOf+PvVr8dMnJ3zzgwztVlE9tcu0CBGoY+CM1NiXY=; b=nB3jkbK9KoFFZwPZzj9MvREQXUBqx3UJ+rTA2cNAgUt9YWe4yL7Q+30Jx8oLLj/0cJ a2xlEB1fRJXV57XrSG/iW5HgZelPk72xVBMXhk5hwz5DEYRPddMFcUhOWSd/6+0oRBe+ xGKxAdol64IRdeJbrXqyzmErN6nP8tmlDEvO5zw81R9t+/iEjYy0CVKcSOyIDqtDW2IO NvJ5ZCIzxgYT1+/59T3G+5sq2dGM1Dk6s3sU8kXSiw8vQYh8s2v28K16YwrF/Qk8xKDk f5EjCtz84TwkIdCEb1DTyPeoKrgRwUmimyzgG/DkZaC0iokwMoCHfAD7dGfMJkiht/ky XNGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912081; x=1767516881; 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=3KOOf+PvVr8dMnJ3zzgwztVlE9tcu0CBGoY+CM1NiXY=; b=EX0FeJ+VcjzpKwh++vuyvRdKf5NXa1LSlNsxx+WShm9Jnn2exAMg6m55HYQUC1Kzm/ XKy0cu5TBziNz3XHRaoVGfT1PHtAelcjjE1OWC543Qjvw4+ED1SDSAO3gUt7wLILiuN3 olij992N8x7WE6VJLzgdlL/vS4/gc/KeEcxRVyJLVlv0l2m2G1ooha/oQ/P6yCoPIiF3 Z8X7H7UtE1L/NV2VWXQUAHCTsiCOksRcyg/7nFctCl9JLw6FIXdOrOl0gu0yxSqIgFJn EZPIdXIk7Wyd10PZ6qDQ+poRrqPSFNwduEHvrIpY4Rtds/KK0Z+PXhIQXyOy5JGkry81 XQkA== X-Gm-Message-State: AOJu0YwohK5SWmJNrAPyXl+Owfg/zJw4nCQeEPI2iMWjB+ayyJzpCktE NbqDgFGgIdit9x4bvbNJmk8yQxYGSsVLZZ4AH+Rk7cxqmHXpYJhvR83AA6Bp72I6 X-Gm-Gg: AY/fxX4VbpA2NUQiwrPz5XHXsBdOeTxCW+oGvstPUqckQ6r+dciaXVahmD45ON9Gyxx Qa38SJQH5KC2jFZE//SF5SRCeGYCtuiDPWMZmbaXA9fK9xSOtvBW1tl84jgIPlPWyeHFQVWFzfw g8TuxYQSnGy9ZwD3GhayixPPp7DjSR1bf/TF5boMbqP7DlUGDH2W0rlPJB8/TRqLFL7WVGatgnl zMWebNeUNDeV4zGDXeg6DFFDEHIDeuWV920HcXBceCHaP26as4958uCS5flTwBtU0egpLxVCWSi sY5QpSl5Do/QwGgZYy8+lam34Tdqbv6iPjPvIpkonxMQrieQY9plm9i/Y5CCBGSz4t+FlvaxxsS e72LTvRvjGnfWq+r2Mu+K5h71w2F2U7GvSa4qT+D6VEaSbNCBZdZvqT/xswIKJDtvS6a7X4Vc89 y/R/TRLt3chH8kNZZh1zm6IP40XLbvNUgPY4t7qDCMRgq+jJBmcw== X-Google-Smtp-Source: AGHT+IFghu2mb3MY1NMCiBivnGXrwTHTaXhyDojXA+blTdIqFE5CTXR0UTfo/0OXc0WVK6P8xE1tRw== X-Received: by 2002:a17:907:9710:b0:b3f:f207:b748 with SMTP id a640c23a62f3a-b8036ecdbd4mr2974520166b.10.1766912080390; Sun, 28 Dec 2025 00:54:40 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 4/9] bhyve: command: handle arm64 console Date: Sun, 28 Dec 2025 09:51:07 +0100 Message-ID: <20251228085112.81805-5-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: 4CVSSDE4EU2VV22LXHZHZRAKFGOLV6S6 X-Message-ID-Hash: 4CVSSDE4EU2VV22LXHZHZRAKFGOLV6S6 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912326097158500 Content-Type: text/plain; charset="utf-8" Console device handling in bhyve is different for amd64 and arm64. On amd64, it's configured as an LPC device, and multiple consoles are supported. On arm64, only a single console can be configured, and the syntax is different: -o console=3D/dev/nmdmguest0A Update the bhyve command generation accordingly. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_command.c | 59 ++++++++++++------- .../aarch64/bhyvexml2argv-console.args | 11 ++++ .../aarch64/bhyvexml2argv-console.ldargs | 7 +++ .../aarch64/bhyvexml2argv-console.xml | 26 ++++++++ tests/bhyvexml2argvtest.c | 1 + 5 files changed, 84 insertions(+), 20 deletions(-) create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.a= rgs create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.l= dargs create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.x= ml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index bc37f4cef9..e6dddfcf97 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -172,34 +172,53 @@ bhyveBuildConsoleArgStr(const virDomainDef *def, virC= ommand *cmd) if (!def->nserials) return 0; =20 - for (i =3D 0; i < def->nserials; i++) { - chr =3D def->serials[i]; + if (ARCH_IS_X86(def->os.arch)) { + for (i =3D 0; i < def->nserials; i++) { + chr =3D def->serials[i]; =20 - /* bhyve supports 4 ports: com1, com2, com3, com4 */ - if (chr->target.port > 3) { + /* bhyve supports 4 ports: com1, com2, com3, com4 */ + if (chr->target.port > 3) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only four serial ports are supported")); + return -1; + } + + virCommandAddArg(cmd, "-l"); + + switch (chr->source->type) { + case VIR_DOMAIN_CHR_TYPE_NMDM: + virCommandAddArgFormat(cmd, "com%d,%s", + chr->target.port + 1, chr->source->= data.file.path); + break; + case VIR_DOMAIN_CHR_TYPE_TCP: + virCommandAddArgFormat(cmd, "com%d,tcp=3D%s:%s", + chr->target.port + 1, + chr->source->data.tcp.host, + chr->source->data.tcp.service); + break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 'nmdm' and 'tcp' console types are = supported")); + return -1; + } + } + } else if (ARCH_IS_ARM(def->os.arch)) { + if (def->nserials > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only four serial ports are supported")); + _("Only one console is supported on arm64")); return -1; } =20 - virCommandAddArg(cmd, "-l"); - - switch (chr->source->type) { - case VIR_DOMAIN_CHR_TYPE_NMDM: - virCommandAddArgFormat(cmd, "com%d,%s", - chr->target.port + 1, chr->source->data= .file.path); - break; - case VIR_DOMAIN_CHR_TYPE_TCP: - virCommandAddArgFormat(cmd, "com%d,tcp=3D%s:%s", - chr->target.port + 1, - chr->source->data.tcp.host, - chr->source->data.tcp.service); - break; - default: + chr =3D def->serials[0]; + if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_NMDM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only 'nmdm' and 'tcp' console types are supp= orted")); + _("Only 'nmdm' console type is supported on arm= 64")); return -1; } + + virCommandAddArg(cmd, "-o"); + virCommandAddArgFormat(cmd, "console=3D%s", + chr->source->data.file.path); } =20 return 0; diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args b/t= ests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args new file mode 100644 index 0000000000..73d0005faf --- /dev/null +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args @@ -0,0 +1,11 @@ +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 \ +-o console=3D/dev/nmdm0A \ +bhyve diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs b= /tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs new file mode 100644 index 0000000000..264ae48441 --- /dev/null +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs @@ -0,0 +1,7 @@ +timeout \ +--foreground \ +--verbose \ +-k 20s 300s bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.xml b/te= sts/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.xml new file mode 100644 index 0000000000..dd599b5133 --- /dev/null +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + + + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index e420fde1e9..564f3fb433 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -334,6 +334,7 @@ mymain(void) driver.caps =3D virBhyveCapsBuild(); =20 DO_TEST("base"); + DO_TEST("console"); =20 virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); --=20 2.51.2 From nobody Thu Jan 8 12:09:44 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=1766912374; cv=none; d=zohomail.com; s=zohoarc; b=ZEzYi3jCs8u0LTX7y4p7dbXgGCFWUwTkpaBta7WsNKAoJA6a2B9zcLfveXjIjxNJnE5e1VJmB82tMuQWLn2HpS8Yo9NP/5uCHw0MMf2LLOHBcIlSBpU3w+LtkJfBSbHtCLnyHAolgfIthe2Rq1+cn9yN7bVHf/hjqUuzeDP5LUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912374; 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=f+b5rol7JLT4pX/uFzPtHDMnrBfUkH8amjse+Cp4qY8=; b=JK9CyBWw4XCS9KhjupBvU1RvcZPwgKlx07EKfhX2A8sjFpy3UOMHWv4hKs3N0ZnTglZdpmqVnaN9MLSnwae+cDPzhFU7KwlSsfR4v/togyQ2o4fie6D9PgR66YHQ0mIUaLeQAohX0uGm26kcOSOKqbMWqUoGhPAqB4c0nLZdocM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17669123740690.6917767651552822; Sun, 28 Dec 2025 00:59:34 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 48B814189D; Sun, 28 Dec 2025 03:59:33 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 1737341AB3; Sun, 28 Dec 2025 03:56:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 337443FBCB; Sun, 28 Dec 2025 03:54:44 -0500 (EST) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 76CC43FBCB for ; Sun, 28 Dec 2025 03:54:43 -0500 (EST) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-649e28dccadso13952450a12.3 for ; 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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:40 -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=f+b5rol7JLT4pX/uFzPtHDMnrBfUkH8amjse+Cp4qY8=; b=isRfQpA7MNkxjIbFfVoyV3C5KSJg+fOcHwPbQ3caSdgmNl7aOTdfT2pI2mAVAhlz7H p48KsjqCkLdSA/f9FR2PZSxJxQQeO6FzHGRVqaJw7GcviWWdmVj553hERG3Zu+9VETm/ Hq1wSH/zzXtFd9pRn88GY2gLasRqFXkrzD/UOyaqJ6M16NJEBJsYSl4tPgi6eGyv62NU lcU75sR/swsMeMilCkaZ/W5KEM1AOIkMRYKir9FxWnbg+Q6Ava2UgVTeZXeTm5NlGJ3R f+WuQ8K/LLr3ywAuEhpFD1HWUjJDAYYiia/Bgv3OrhWKyWWpLIHVR8jPWsQTOJlypdLq zs+A== 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=f+b5rol7JLT4pX/uFzPtHDMnrBfUkH8amjse+Cp4qY8=; b=HzUAXfOwUF4xXhdiGvQQgDtmhiifibcjw7YRXTh462AKL1SOe5Rvx9kSy0/C8TQGoX 1cpbQmxnilv38KZqlzgVDIs5R/NU2oX1uGnA823uBFBN32N+awnb//uAIxGEICo75kVN 3ywZD0tsrQhWErp7BwqidgGPrPWo3phzi4CTbiJpmo+VIQa8TEW4Y7pKbdmR62zLCuL5 hKeQG3YF08SvNOV+6X/+zApzkU4vdjRi4y0JLzd9EdyzQkgt4S6f8VQa4U2mLjl7mU27 hBOKce49O/RPejtcEjX1EfbCeYPCJ9bNwB3cCP7GyouKLkzyYJ8ya20IZfoAgXfto60Q NIVA== X-Gm-Message-State: AOJu0YxH3E8k+f+WKhlOIEsxvKFeAdh0J0bTZbIputqZ+TGxFLlcpAnp Iw8Tl/Q1nlvJ6tMymt5WAFuzbdsBcQO5ARxBLfrt81EBunjDAhaJuJcHkxC00gbb X-Gm-Gg: AY/fxX40LSn9H0CRZPwkwjfXkitYBnzM40NRc55DKd79svsZfqe3DMQ6SAnMRmxcHyq ZCCVj6uYMZyBh/13ZqIb/4jVUdplGCn5hQd0U+hh3P7taGIoYBwl6/L7HBBbsAIzFl4L/q4uOAc Uk+HWcbOIxeRLMO+6YwrZCJPpQW91TK2i+D3sWJ2j4cFhvOSFzD8ungDFPlYHLTpNDXHabqkFRn 3MJi7USOPhdw56jvsm8PSSC5ziifDnZ/PVbfT67e16qKSY8kmT5WY57HkwIdBNnNSiGkska84Kt Hwjm2u0SzBaIKCdyamwQe8f64xcgKcq+qVZnRffyldRdlnT8Y90wv26SGQcIsisCXlsMd0WcMiW Lze5qkEPJI3evbMPMgpeDDE7ol97n2mberKToz1UNuuR0W0m8QMCT86e2LUixvnDoz6EoxxQPxK yi6qiqWhyCWnzLZAdMvXmzvsDkknrSmxKPrv1eYWSG0NQohQAk4g== X-Google-Smtp-Source: AGHT+IEfcNXik+4BdGgJl8XS8el6RV3Ns/mA5zAIebNzNpGy8Ln3wwZ0yE1xF9qwd0jZjM5qxRJMOg== X-Received: by 2002:a17:907:7e83:b0:b73:7b97:5bfb with SMTP id a640c23a62f3a-b803717d9e7mr2640831366b.33.1766912081303; Sun, 28 Dec 2025 00:54:41 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 5/9] bhyve: command: make -H and -P args amd64-only Date: Sun, 28 Dec 2025 09:51:08 +0100 Message-ID: <20251228085112.81805-6-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: JUFRZ5SOBDFHJAKOJODR3LKTSHXQQSY7 X-Message-ID-Hash: JUFRZ5SOBDFHJAKOJODR3LKTSHXQQSY7 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912376173158500 Content-Type: text/plain; charset="utf-8" These arguments control IA32 HLT and PAUSE instructions, so there are supported only on amd64. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_command.c | 8 ++++++-- tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args | 2 -- .../bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index e6dddfcf97..8c1e06b736 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -928,9 +928,13 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver= , virDomainDef *def, * * The PAUSE exit is most useful when there are large numbers of guest= VMs running, * since it forces the guest to exit when it spins on a lock acquisiti= on. + * + * These flags are currently supported on amd64 only. */ - virCommandAddArg(cmd, "-H"); /* vmexit from guest on hlt */ - virCommandAddArg(cmd, "-P"); /* vmexit from guest on pause */ + if (ARCH_IS_X86(def->os.arch)) { + virCommandAddArg(cmd, "-H"); /* vmexit from guest on hlt */ + virCommandAddArg(cmd, "-P"); /* vmexit from guest on pause */ + } =20 virCommandAddArgList(cmd, "-s", "0:0,hostbridge", NULL); =20 diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args b/test= s/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args index b8388f5691..51eef94fd0 100644 --- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args @@ -2,8 +2,6 @@ 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 \ diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args b/t= ests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args index 73d0005faf..ae0e6bc1b3 100644 --- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args @@ -2,8 +2,6 @@ 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 \ --=20 2.51.2 From nobody Thu Jan 8 12:09:44 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=1766912420; cv=none; d=zohomail.com; s=zohoarc; b=goUogPwYfU4b3xaXQwZT84xjJqrNj5oa6x612FgvMvyCca+kVRRMBT/tK9BvTbr9Ds4kZEOO75bLkr1LqR/oflkFSUs8IwBddH38FTr68GsCsa7/58sRvxirTqPv5xf2hIlnOmvLx077blh1jz4xi61/6oV5/kfNo2B/fxx4er0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912420; 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=kXUI4QY2mc+IJbS7jgLsJotVbFkbn2ehvIfOaPU+QGA=; b=PO1Uf1IxPZ7ffPJvZfY7xGM6m5/15yB4rMlWc7IQJKQbDo4ec5qVoyLBN7rAe+bTD5KJ61ac3MuMuNnWl6Bt91FHrQX64LngFAoYbF71QHTKApn1TipFqfarOnjsnvP+8Lt84RB3FvcAyOGKdtEWyLQRJDhcaZuxLXuz/IDTEuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912420131620.0148419129014; Sun, 28 Dec 2025 01:00:20 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id F00B73FD29; Sun, 28 Dec 2025 04:00:18 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 39A5C41A29; Sun, 28 Dec 2025 03:57:03 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 253D83F34C; Sun, 28 Dec 2025 03:54:45 -0500 (EST) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 222A83FC5D for ; Sun, 28 Dec 2025 03:54:44 -0500 (EST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-b7a02592efaso1249872366b.1 for ; Sun, 28 Dec 2025 00:54:44 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:41 -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=kXUI4QY2mc+IJbS7jgLsJotVbFkbn2ehvIfOaPU+QGA=; b=kz0OoX91NceZuLG3jbmF7z5qD7AdIPxc0ouTJs15RXn7XyJUs6BM3izJ0y3z+VVusb D32pDodbicGD+tOE56sGeeCI8u7bEqxAxBA49lvxHqYjDz0jP9JwGO9oJ57wr62FyrgM M01i7r1CGu34/qDGEOFTkFd7iRCibjdFwkfLv97rqU/962UWe6MBUCoIC0pViZTmpHha udrN3iyszesCMu4x6FQuuSHmh3/Xppyml5BwPD2UU5vITGfFCsE0MYnMVseAfe7b5NHV h0q6W9g5458LtwSxWf6zGm4VAUuSZRqAi0WnzzGW7uDRQTNTIhLmrnHaIgqr88xE1f2g 1TRQ== 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=kXUI4QY2mc+IJbS7jgLsJotVbFkbn2ehvIfOaPU+QGA=; b=NOWuFkpKNQ/wqONUARZwDIS5qAmb6hljQ7+6KoILdhyAlutQEVdSjzIIPmx/+aIlro M7/1WjyzQbe9zYhEYc1mpu4uc9t24IgyA3162LwpzVBpRvneylfVsD6LKFoPxjmPVCH8 Rz+X3gPmhlP26p9+5U1otG2XGbQcOcvSBBYpaJ32IjGG9jItODV0DDkLNPzDj07/YzdL pUoiOfbjtxNLt6BvKucoM1OWxZUmDXRvjZpAmCC34Zgfym/juRY29kWmNQOsvI1AtE95 d9z0Txib0LBwWGUEcw6l1uRyyDuNhYaQ+D8zYxiThjkiz/P8ncppmlTEBAER8eIzZXQi 83Gg== X-Gm-Message-State: AOJu0Yy0401YLaO0fqfYWxLjvjaew/0q8PXb9r5jGMCx+Lxe6ZoONNuS nw7MBsWJoCAW8ek5WG+EM27BiV7AcJarQ7MGrWw5KsIHq5tZFkrmM/xhat4ztZBi X-Gm-Gg: AY/fxX5hde4cPSeSBijhnPZJuJWdLLzIBtkBTq6riUCEZQ24XkF2/jvNBX+xtUpEZcg 0a3VmeLaA2SyUk2Zli/pP35WTCqfSS9OIPHLDqBriHIAYoV+ifPLu+FdKos38AIXPkjtT/LGycN KveFc3CKvTwzh7ScKvROpg9qH9+W1CNVDdzmczxsHg74Hi9sLVEqdVzWWrwpul66Y/uUBJ23use hGZa8dpwMi7Rmw8zDRvDtbhO08QA0ZhaJe/WSt9x6BGE5iry3TVWGaZKWFHAxl9MEkbP6tB04iN II4hM4vtJMCXL4U2TNSx/FOXDYtk0J0XMA4iXNXY/y1b/oNicysrvLB9LG0Pw8PsskrkN3SbH7+ RAXwS6YpPbQdWCBDA1iSyIY75ylshAg2IP2tnKmhmuV34ejHo3u5qhIMAprxWAf59Ct6wh9t1pS FehfKBh/OF75nD6kXG38qVlyFkf4TEUO/BcvmegVPWoDQ7eObBRw== X-Google-Smtp-Source: AGHT+IGvem8xwsCSo7egFY0rxecR9PawFXBR5Gmn8tuOrHn9n8bfh9JBu367rdykxIbuP6CDOCY4BA== X-Received: by 2002:a17:906:9f88:b0:b73:6d3c:e0f2 with SMTP id a640c23a62f3a-b8037152a24mr3075066366b.37.1766912082337; Sun, 28 Dec 2025 00:54:42 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 6/9] bhyve: command: handle arm64 bootloader Date: Sun, 28 Dec 2025 09:51:09 +0100 Message-ID: <20251228085112.81805-7-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: BHVR7RB4PIWDTDN6I6GWXLCRHQJ66JDV X-Message-ID-Hash: BHVR7RB4PIWDTDN6I6GWXLCRHQJ66JDV X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912420339158500 Content-Type: text/plain; charset="utf-8" Just like consoles, bootloader is handled differently on arm64. It also does not used the LPC bus, and is configured with: -o bootrom=3D/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin Additionally, fill firmware inforamtion only for amd64. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_command.c | 25 ++++++++++++------- src/bhyve/bhyve_firmware.c | 3 +++ .../aarch64/bhyvexml2argv-bootloader.args | 9 +++++++ .../aarch64/bhyvexml2argv-bootloader.ldargs | 1 + .../aarch64/bhyvexml2argv-bootloader.xml | 24 ++++++++++++++++++ tests/bhyvexml2argvtest.c | 1 + 6 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloade= r.args create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloade= r.ldargs create mode 100644 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloade= r.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 8c1e06b736..e767afd18a 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -940,17 +940,24 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *drive= r, virDomainDef *def, =20 if (def->os.bootloader =3D=3D NULL && def->os.loader) { - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_BOOTROM)) { + virArch arch =3D def->os.arch; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, "bootrom,%s", def->os.loader->path); - if (def->os.loader->nvram && def->os.loader->nvram->path) - virBufferAsprintf(&buf, ",%s", def->os.loader->nvram->path= ); =20 - virCommandAddArgList(cmd, "-l", virBufferContentAndReset(&buf)= , NULL); - } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Installed bhyve binary does not support UEFI= loader")); - return NULL; + if (ARCH_IS_X86(arch)) { + if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_BOOTROM))= { + virBufferAsprintf(&buf, "bootrom,%s", def->os.loader->path= ); + if (def->os.loader->nvram && def->os.loader->nvram->path) + virBufferAsprintf(&buf, ",%s", def->os.loader->nvram->= path); + + virCommandAddArgList(cmd, "-l", virBufferContentAndReset(&= buf), NULL); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Installed bhyve binary does not support = UEFI loader")); + return NULL; + } + } else if (ARCH_IS_ARM(arch)) { + virBufferAsprintf(&buf, "bootrom=3D%s", def->os.loader->path); + virCommandAddArgList(cmd, "-o", virBufferContentAndReset(&buf)= , NULL); } } =20 diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c index 57ad0031b0..54e3ce296a 100644 --- a/src/bhyve/bhyve_firmware.c +++ b/src/bhyve/bhyve_firmware.c @@ -125,6 +125,9 @@ bhyveFirmwareFillDomain(bhyveConn *driver, =20 virCheckFlags(0, -1); =20 + if (!ARCH_IS_X86(def->os.arch)) + return 0; + if (def->os.firmware =3D=3D VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) goto out; =20 diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.args = b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.args new file mode 100644 index 0000000000..a07e70d7d4 --- /dev/null +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.args @@ -0,0 +1,9 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-s 0:0,hostbridge \ +-o bootrom=3D/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin \ +-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/aarch64/bhyvexml2argv-bootloader.ldarg= s b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.xml b= /tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.xml new file mode 100644 index 0000000000..6e1123e4e0 --- /dev/null +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-bootloader.xml @@ -0,0 +1,24 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + /usr/local/share/u-boot/u-boot-bhyve-arm64/u-= boot.bin + + + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 564f3fb433..26619a22b9 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -335,6 +335,7 @@ mymain(void) =20 DO_TEST("base"); DO_TEST("console"); + DO_TEST("bootloader"); =20 virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); --=20 2.51.2 From nobody Thu Jan 8 12:09:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1766912838; cv=none; d=zohomail.com; s=zohoarc; b=Yeog06a/qojl6FscOqW2ci0GLprvyiTriWAatBHH6n0ru0r0D/VfPIrPbj9dpe+IRQVi7tDbw7rYO+8w/beZyvTeQIJy8KDW+bV3XUidgKiSDYiWvSNjVZJkmnbB5L8VZM2woKAGmCFXoVywtUt2qb6jN2Wo8qijpAkrYXdMegs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912838; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=UmSzNWTk5Z4TZFuYjbNc6Q2UgGnQ6vN1PBJOqa9mGSk=; b=oFzhE8cxgDGhbByUi+MaKZjcqWx/SloN/M7/z7TrBuj1IXpS03M/+YDwEUrWdd+08wRoWYABoZ/7AwqjBPHQziUpKFf4Y6aYilWOMSv3io/2+Vj+FbwS1+S3nujLK6nwEiZmcB5TsMHIMplNidzzzdwH0tZVVqqC3mG0Sgb23Sk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912838616514.9756338216317; Sun, 28 Dec 2025 01:07:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id BDA6F417D0; Sun, 28 Dec 2025 04:07:17 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 4383141BE0; Sun, 28 Dec 2025 03:57:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id ADA063FBCB; Sun, 28 Dec 2025 03:54:47 -0500 (EST) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D76B03FBC4 for ; Sun, 28 Dec 2025 03:54:45 -0500 (EST) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b72b495aa81so1382947366b.2 for ; Sun, 28 Dec 2025 00:54:45 -0800 (PST) Received: from tulp.my.domain (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8037f0ebbasm2843201266b.55.2025.12.28.00.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:42 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766912084; x=1767516884; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UmSzNWTk5Z4TZFuYjbNc6Q2UgGnQ6vN1PBJOqa9mGSk=; b=aBNY+CNfjDbZ51GbbZZfvPBal2uQBqdnt7x6dZiP57vxilEAsc3jAcTQtkuTCS4rLw EoEvX5yWdZGb5b3sbgSeO8W8QF1cpA5UqRVECffcY9r1/aKmpcLUb0XVlvxhHdbDKpqf h7JBd7KyV03SIe4ct8oMkqTD8bXgjkRRzwc6h6pxtaQ26tMgDAehW6eeTNXcNb0oxfeO as7uhH7udhwJI6ZG4EUXRaV7kITgTxAzfzgj4uUJmtcyrmNOYxjxPw/CT6f5KAkKeOIt mxNgpodd8/XjJ7sbv9zp2qXbga6EBN/Qz9rJ+qJFV/gTm9QiY+XKkZPgQtLk+x3Eab4X QMfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912084; x=1767516884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UmSzNWTk5Z4TZFuYjbNc6Q2UgGnQ6vN1PBJOqa9mGSk=; b=HxuHrsAplIMArL53GMAyPPG8YXcb/ttGbwu7Erzy0o0DZNl0IL0kAgexS6/+1PSn2N 6NbDVTGpBjrFUu9nO/sHw8RGRL0o9ArLiQWAZoF6kW/dJxUNSPFvxFiPLANvaliHhIwX dYYQulq/I4R9b7X6Vj5s3zOXpnlKd+GHXdaxq0nIx2ggzHMGJtEkOXDdfG+K+yagSoZk bNfTXfSOGU76eOJQxh0fMKFjocEU7lIwHGq5aV7mHF0fVv6xzwPSmrvDjZaQHHSWHIVy KtvKgigu3PrrmErAVUPdGSQ7C0KUI4X7CUWMR/44Lxb/pc1Dr03FOgeRgkgoY0hjS7Gu YPQw== X-Gm-Message-State: AOJu0Yxy6/TVPfcWjRLNOf//QkdUpGmhdv1fAgUdJ/lppfIBZUpzuj4k ctSF6qmrT2RkRtuvpL21HFvtGdRUwAyBohpql2auXqkioUpKSzI25c+KBY8X7xx+ X-Gm-Gg: AY/fxX6WmSIXmbN7kvJrzHRg67V0fezuq4nGrRzKSzj85g5CZNUiJy97PKxQqnT3WPU y1pnWw/h+mNy1RdlSaGlScsZmO7mrVUjdSzGTdPj8ivJCa6gZYdYumQ9Ofru76X4WkcRGoXpoTZ RibVIQOewRc2jpyk6xeyk5NnkVFfIMZBphp9PabvHCKEkcqtPVKLVzdemHJ77liCfdklPvHN5N0 xBkeNu8bN58N3RfbilGofQxB8HhInqF1Arygv3WdE6G4wFW75ypJJJ6Z1zEokipFYW4m/7lcg3q TL/dJ6vujnXUsF0DRQbLUoy4KBcpsybLjJDHa+3YAdhfOyE904ZnmecNbR3LrnqkEpDCuPiucsL milfYfh9FsqfbvlNp6kzYdQfF+Om5VXrTBJ8GX7hPiDSUXapXs6VD9uCgOzx5DY7owKGnwLragu g36e8nEYkwJNMtOphw3OaB6cb7hJuTxOKPSth8G0mabPkq7zQnzg== X-Google-Smtp-Source: AGHT+IET9Qjp02rpUk5zfZA2vYUj8d8eZxM8QBUuqej83GYh5jC5izn2eEME2RV/I3KyXMO8EyKeCg== X-Received: by 2002:a17:906:ef08:b0:b72:6728:5bb1 with SMTP id a640c23a62f3a-b803726dd35mr3271962866b.56.1766912083881; Sun, 28 Dec 2025 00:54:43 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 7/9] bhyve: tests: prepare for arm64 xml2xml tests Date: Sun, 28 Dec 2025 09:51:10 +0100 Message-ID: <20251228085112.81805-8-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251228085112.81805-1-bogorodskiy@gmail.com> References: <20251228085112.81805-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z24JLH3J2R5ZZQQNSOEQQ4RCJUEICQYH X-Message-ID-Hash: Z24JLH3J2R5ZZQQNSOEQQ4RCJUEICQYH X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912839727158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- .../bhyvexml2xmlout-2-nvme-2-controllers.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-4-consoles.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-acpiapic.xml | 0 ...bhyvexml2xmlout-addr-isa-controller-on-slot-1.xml | 0 ...hyvexml2xmlout-addr-isa-controller-on-slot-31.xml | 0 .../bhyvexml2xmlout-addr-more-than-32-sata-disks.xml | 0 .../bhyvexml2xmlout-addr-multiple-sata-disks.xml | 0 .../bhyvexml2xmlout-addr-multiple-virtio-disks.xml | 0 ...exml2xmlout-addr-no32devs-multiple-sata-disks.xml | 0 ...hyvexml2xmlout-addr-no32devs-single-sata-disk.xml | 0 .../bhyvexml2xmlout-addr-single-sata-disk.xml | 0 .../bhyvexml2xmlout-addr-single-virtio-disk.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-base.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 0 .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 0 .../bhyvexml2xmlout-bhyveload-explicitargs.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-commandline.xml | 0 ...xml2xmlout-console-master-slave-not-specified.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-console.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-custom-loader.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom-grub.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-disk-virtio.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-fs-9p.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-grub-bootorder.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-grub-bootorder2.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-grub-defaults.xml | 0 .../bhyvexml2xmlout-input-xhci-tablet.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-isa-controller.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-localtime.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-macaddr.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-metadata.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-msrs.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-nvme.xml | 0 .../bhyvexml2xmlout-passthru-multiple-devs.xml | 0 .../bhyvexml2xmlout-serial-grub-nocons.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-serial-grub.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-serial-tcp.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-serial.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-slirp.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-sound.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-virtio-rnd.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-autoport.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-password.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-resolution.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgaconf-io.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgaconf-off.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgaconf-on.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait-no.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-vnc.xml | 0 .../{ =3D> x86_64}/bhyvexml2xmlout-wired.xml | 0 tests/bhyvexml2xmltest.c | 12 ++++++++---- 56 files changed, 8 insertions(+), 4 deletions(-) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-2-nvme-2-c= ontrollers.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-4-consoles= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-acpiapic.x= ml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-isa-c= ontroller-on-slot-1.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-isa-c= ontroller-on-slot-31.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-more-= than-32-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-multi= ple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-multi= ple-virtio-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-no32d= evs-multiple-sata-disks.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-no32d= evs-single-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-singl= e-sata-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-addr-singl= e-virtio-disk.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-base.xml (= 100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder1.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder3.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= bootorder4.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-bhyveload-= explicitargs.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-commandlin= e.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-console-ma= ster-slave-not-specified.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-console.xm= l (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-custom-loa= der.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom= -grub.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-disk-cdrom= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-disk-virti= o.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-fs-9p.xml = (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-grub-booto= rder.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-grub-booto= rder2.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-grub-defau= lts.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-input-xhci= -tablet.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-isa-contro= ller.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-localtime.= xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-macaddr.xm= l (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-metadata.x= ml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-msrs.xml (= 100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-nvme.xml (= 100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-passthru-m= ultiple-devs.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial-gru= b-nocons.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial-gru= b.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial-tcp= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-serial.xml= (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-slirp.xml = (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-sound.xml = (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-virtio-rnd= .xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-autopo= rt.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-passwo= rd.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-resolu= tion.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgacon= f-io.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgacon= f-off.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-vgacon= f-on.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait-n= o.xml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc-wait.x= ml (100%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-vnc.xml (1= 00%) rename tests/bhyvexml2xmloutdata/{ =3D> x86_64}/bhyvexml2xmlout-wired.xml = (100%) diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-2-nvme-2-controllers= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-2-nvme-2-controller= s.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-2-nvme-2-controllers.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-2-nvme-2-control= lers.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml b/tes= ts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-4-consoles.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-4-consoles.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml b/tests= /bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-acpiapic.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-acpiapic.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-= on-slot-1.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-c= ontroller-on-slot-1.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-o= n-slot-1.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-control= ler-on-slot-1.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-= on-slot-31.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-= controller-on-slot-31.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-isa-controller-o= n-slot-31.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-isa-control= ler-on-slot-31.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sa= ta-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-more-t= han-32-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sat= a-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-more-than-3= 2-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-d= isks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-s= ata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-di= sks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-sa= ta-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio= -disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple= -virtio-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-= disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-multiple-vi= rtio-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multip= le-sata-disks.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-n= o32devs-multiple-sata-disks.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multipl= e-sata-disks.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-mu= ltiple-sata-disks.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single= -sata-disk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32= devs-single-sata-disk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-= sata-disk.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-no32devs-si= ngle-sata-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-dis= k.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-sata-d= isk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk= .xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-sata= -disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-d= isk.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-virt= io-disk.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-di= sk.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-addr-single-virt= io-disk.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml b/tests/bhy= vexml2xmloutdata/x86_64/bhyvexml2xmlout-base.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-base.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.= xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder.= xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.x= ml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 1.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der1.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 2.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der2.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 3.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der3.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4= .xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootorder= 4.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.= xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-bootor= der4.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitar= gs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-explici= targs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitarg= s.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-bhyveload-explic= itargs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml b/te= sts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-commandline.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-commandline.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave= -not-specified.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-conso= le-master-slave-not-specified.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-= not-specified.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console-master-s= lave-not-specified.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml b/tests/= bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-console.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml b/= tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-custom-loader.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-custom-loader.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml = b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom-grub.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom-grub.= xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml b/tes= ts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-cdrom.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml b/te= sts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-virtio.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-virtio.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml b/tests/bh= yvexml2xmloutdata/x86_64/bhyvexml2xmlout-fs-9p.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-fs-9p.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml b= /tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml = b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder2.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-bootorder2.= xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml b/= tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-defaults.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-grub-defaults.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xm= l b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-input-xhci-tablet.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-input-xhci-tablet.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-input-xhci-table= t.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml b= /tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-isa-controller.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-isa-controller.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-isa-controller.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml b/test= s/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-localtime.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-localtime.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml b/tests/= bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-macaddr.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-macaddr.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml b/tests= /bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-metadata.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-metadata.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-metadata.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-msrs.xml b/tests/bhy= vexml2xmloutdata/x86_64/bhyvexml2xmlout-msrs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-msrs.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-msrs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-nvme.xml b/tests/bhy= vexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-nvme.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-passthru-multiple-de= vs.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-passthru-multiple= -devs.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-passthru-multiple-dev= s.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-passthru-multipl= e-devs.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.x= ml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub-nocons.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub-noco= ns.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml b/te= sts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-grub.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-tcp.xml b/tes= ts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-tcp.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-tcp.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial-tcp.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml b/tests/b= hyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-serial.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-slirp.xml b/tests/bh= yvexml2xmloutdata/x86_64/bhyvexml2xmlout-slirp.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-slirp.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-slirp.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-sound.xml b/tests/bh= yvexml2xmloutdata/x86_64/bhyvexml2xmlout-sound.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-sound.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-sound.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml b/tes= ts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-virtio-rnd.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-rnd.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-virtio-rnd.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml b/t= ests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-autoport.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-autoport.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml b/t= ests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-password.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-password.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml b= /tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-resolution.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-resolution.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml b= /tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-io.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-io.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml = b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-off.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-off.= xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml b= /tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-on.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-vgaconf-on.x= ml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait-no.xml b/te= sts/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait-no.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait-no.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait-no.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait.xml b/tests= /bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-wait.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc-wait.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml b/tests/bhyv= exml2xmloutdata/x86_64/bhyvexml2xmlout-vnc.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-vnc.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml b/tests/bh= yvexml2xmloutdata/x86_64/bhyvexml2xmlout-wired.xml similarity index 100% rename from tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml rename to tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-wired.xml diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 9d8e910b6e..5571b25341 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -30,11 +30,12 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *xml_out =3D NULL; bool is_different =3D info->flags & FLAG_IS_DIFFERENT; int ret =3D -1; + const char *arch =3D virArchToString(virArchFromHost()); =20 - xml_in =3D g_strdup_printf("%s/bhyvexml2argvdata/x86_64/bhyvexml2argv-= %s.xml", - abs_srcdir, info->name); - xml_out =3D g_strdup_printf("%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s= .xml", - abs_srcdir, info->name); + xml_in =3D g_strdup_printf("%s/bhyvexml2argvdata/%s/bhyvexml2argv-%s.x= ml", + abs_srcdir, arch, info->name); + xml_out =3D g_strdup_printf("%s/bhyvexml2xmloutdata/%s/bhyvexml2xmlout= -%s.xml", + abs_srcdir, arch, info->name); =20 ret =3D testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, xml_in, is_different ? xml_out : xml_in, @@ -142,6 +143,9 @@ mymain(void) /* USB xhci tablet */ DO_TEST_DIFFERENT("input-xhci-tablet"); =20 + virTestSetHostArch(VIR_ARCH_AARCH64); + driver.caps =3D virBhyveCapsBuild(); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); =20 --=20 2.51.2 From nobody Thu Jan 8 12:09:44 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=1766912929; cv=none; d=zohomail.com; s=zohoarc; b=cI3NPRl7OwODT+Qz9elUxYruVPS927rHCNOJPjz3hDPrWv0z2H3bWNhCwoxDtPbdDKxpNIirDjVvfu6ZKgukmGUGJ65LSOBc6jJbrKRSWP3y/74TkNZVNoLJT9/hUoek5YPu1UV48FeGvW6zJLO+DX70Lt6vA5ni5tAWGovygmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912929; 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=MunergR68Msm4iNh7dtwlPoZssR9uVSHoKpMxU3ZY0I=; b=kJ+Bx5J/kJuQj2TVcvEhA1bGziEvAE8DUbrI/KgenOq5vP1vk0JtuaVh6GehHhgrMiXKfW471E6idfboC80yzwHY37rnX7dYIeiHi0vEaKRXrD4MSlMClSqtc5zxcoLj4R8gSoWH76ZzPHWPlTw2xcNf4Gtl7sBe5AWuFusxBgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912929712760.242215438992; Sun, 28 Dec 2025 01:08:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id A57363FB01; Sun, 28 Dec 2025 04:08:43 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id BFF5441CA1; Sun, 28 Dec 2025 03:57:25 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 45A353FBC4; Sun, 28 Dec 2025 03:54:48 -0500 (EST) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 BA9E93FC75 for ; Sun, 28 Dec 2025 03:54:46 -0500 (EST) Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-64b4b35c812so11398941a12.0 for ; Sun, 28 Dec 2025 00:54:46 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:44 -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=1766912085; x=1767516885; 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=MunergR68Msm4iNh7dtwlPoZssR9uVSHoKpMxU3ZY0I=; b=HyQpGY1hZB7aeaEILeVE7V5c57bE0NqOzAiCEcasl3i+4cpkFaoTz5jreMVhp8Q7yo P7Tw7hvSjis69eMPBtw0rnWm37TC6H+FL1eT+J3iAGewAk46B1HtUl6Xzw2zOahR1yBD LRGz11C7p4pmxCzp3M1gCyiAgRwLPLXKhdbEHekurENGbZshc4Wiv3utGgUHh77C3egg mBqSUng5YpsB4rAovtWbIw7TAwnxxDtmxPldMvzojhCdOPo7zCJkb7xtFh1LAoWaM7J9 4hxa2DJnsMI+8b7zNYs0Gc614GF32F9qV6lXgsueM3JEiRQTdZ9Hhkw3H5zETOvHFOE6 OCeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912085; x=1767516885; 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=MunergR68Msm4iNh7dtwlPoZssR9uVSHoKpMxU3ZY0I=; b=gTMu7IYHBfr0ZX2c0WFXFQo/a5mFjguYc/l/N5Swgl8YULouJxhYG2dE8T1Bvtpcnt PB3F4R9w4HPiPxIDBKpP9vDlZ7wHXBMWZUygNDNwD+cNTdOX37kgADFM2HKUHca0rQaa nRgAHSJfJDfBsaNo26cc2yjRSlQJhwaar9iOg2vPQxblrxUw3TqLLxsDHmibkPGPPXiB CHkAGZsDNQIsXPh3YkCZ3kzUB2Ie2ouwIDX6+atCXoQtMvwoVNM7+PLCRm9BAnDbwDC3 PA862TRBPDDHeHpl9Q6gR2f7G9+rwsf/2lRwcZXqZKXEC711xFF898mEvimMtR7ifVfK f+Nw== X-Gm-Message-State: AOJu0Ywk5P6NbbhGn5eozLbMQguQFVqibIoaWMIdKhl6bp/U/mFQuATq 8HNCA2Ca6eXjLTJ/t8Vb6nURibpKinlzpt1leitxne5XtXGDYkUFGnx7y96X6XxZ X-Gm-Gg: AY/fxX64HspkRAGhqXaniB22J17PJAh4sRKuPXYO4uqpBytBaOHB/Gym55fUIljlMP1 vqjOdfjbZvLCZDDbXBiMHDhUsfpHx2CFa1ZGGAwdr2NwqcUhKyAJ7Cc+3gOngeb9yKUv9wT3Uu4 3DOLqhemDcnm02qqy2smLVgmvoCD6f/reJuCfa+WyinmChjv351oJUfJF5LoWHi0Mv9CUFe5493 V9jhE6vlZcGn/TuW2GolnGa8+5SMOaWC2VXIg4UX1aDJ6rtSarg/e9Yc3mOSazdevtNGp3ZOJkg yU2ORzCuqLl0ado0806Wx1r9Kd6SpmFw7+t3tqATfeTfg2yxTwsMhTxIXTVqpA1a/MXVBE8hGW4 Jw4bKDuJ0psxcYzjowvxYLVt9ROY0oYyXWsm/2yzipmE8ZQ8zJInUn96cNB/KKK7hI1h9vf2lEf fdSEYtieCgglR5gyIfpTE3R4wsRbycWpOltFtLQbdNSZbpEAKOtQ== X-Google-Smtp-Source: AGHT+IHnIwDd7pBUrXihzlRet4yyZPqXpz0XI8+XQUGGESMKl5adgwW5+UUcuK7cyn6S9tw4PXiK/A== X-Received: by 2002:a17:907:8e95:b0:b7c:e320:5250 with SMTP id a640c23a62f3a-b8036ebbe3fmr2604594666b.7.1766912084858; Sun, 28 Dec 2025 00:54:44 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 8/9] bhyve: tests: add xml2xml arm64 tests Date: Sun, 28 Dec 2025 09:51:11 +0100 Message-ID: <20251228085112.81805-9-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: 4ADAM7EYNEROH76NCYWK2N3YIAFRRZ75 X-Message-ID-Hash: 4ADAM7EYNEROH76NCYWK2N3YIAFRRZ75 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912930109158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- .../aarch64/bhyvexml2xmlout-base.xml | 30 +++++++++++++++ .../aarch64/bhyvexml2xmlout-bootloader.xml | 31 +++++++++++++++ .../aarch64/bhyvexml2xmlout-console.xml | 38 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 4 ++ 4 files changed, 103 insertions(+) create mode 100644 tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.= xml create mode 100644 tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-bootl= oader.xml create mode 100644 tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-conso= le.xml diff --git a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml b/t= ests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml new file mode 100644 index 0000000000..573e42bfa9 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml @@ -0,0 +1,30 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + + + + + +
+ + + diff --git a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-bootloader.x= ml b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-bootloader.xml new file mode 100644 index 0000000000..67047040bb --- /dev/null +++ b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-bootloader.xml @@ -0,0 +1,31 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + /usr/local/share/u-boot/u-boot-b= hyve-arm64/u-boot.bin + + + + destroy + restart + destroy + + + + + +
+ + + + + + +
+ + + diff --git a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml = b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml new file mode 100644 index 0000000000..2bea620cbe --- /dev/null +++ b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml @@ -0,0 +1,38 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + + + + + +
+ + + + + + + + + + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 5571b25341..a99e25a5bb 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -146,6 +146,10 @@ mymain(void) virTestSetHostArch(VIR_ARCH_AARCH64); driver.caps =3D virBhyveCapsBuild(); =20 + DO_TEST_DIFFERENT("base"); + DO_TEST_DIFFERENT("console"); + DO_TEST_DIFFERENT("bootloader"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); =20 --=20 2.51.2 From nobody Thu Jan 8 12:09:44 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=1766912983; cv=none; d=zohomail.com; s=zohoarc; b=IS+rDWJLZfu+szDqBPArgKJr/uQ1sg/Ag/O2CfbJHQqM503aESFDhAWjdPmWOll3XoII/qiBbCMfKaqT8lz0JyxoQfAhK5mkpVy5PLI+f+Ixf9bHlxrQ82bBCyl1D0GKg9gdI3j0/TCV10tVZRJe2CEekML20WXoZP5VWdG3vN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766912983; 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=BP0z0yxtCBhC3suiXiXoyRozkVUbwnEdCqcv59nhXZ8=; b=BWuzR2BlViJON6nnuvJiXvEsLHXPBGiq+REo1wybfdbkKfLowrbHWpvbThFb22b8XIMyJtafUr7hoZfsjXwWb9drBCVlKeJ65mO/DsTNaxz9rZSPvTAjJUaaKFJQetpTk295jEs4k3I8qf0UfqmMejIS/OpsOlSWJkomRjKLaVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766912983425445.27043288839184; Sun, 28 Dec 2025 01:09:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 681533FB09; Sun, 28 Dec 2025 04:09:28 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 91AA441B79; Sun, 28 Dec 2025 03:57:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 14ED23FBC4; Sun, 28 Dec 2025 03:54:48 -0500 (EST) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.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 D69493F34C for ; Sun, 28 Dec 2025 03:54:47 -0500 (EST) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-64b7b737eddso10146810a12.1 for ; Sun, 28 Dec 2025 00:54:47 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 00:54:45 -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=1766912086; x=1767516886; 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=BP0z0yxtCBhC3suiXiXoyRozkVUbwnEdCqcv59nhXZ8=; b=KzjkMjVaEYi7BAO8GBMoQ/+2WGbDHzTbRpd9+x80z56F17fUTP3oklpPQQL8ONbIDM U/eZdBKfFr8awOZsMYP9tcHgsrwbQcNxYlAg6oDhUSV4iCwkWDpCjmSLr6rSeDcJ6+NY mDNiTSbKxS0pspO8oqs5i70sMyf27FSQpj72x/r4/4AI7c2mi3XSw4PrNTS/GtL35+cJ IaMniSHzwn4uDQyY0w5O9YqaUqn15OOpsQk/02PCpZ2dJfReBiLU96zazdZc5TZPqTSy wo0aQcYaRETQL1Dj2sh9a5R3jn3p8cw7Cs40KiGhFhbeoU6YCF7NFi8xYs9xVuOzr6/x 6C+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766912086; x=1767516886; 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=BP0z0yxtCBhC3suiXiXoyRozkVUbwnEdCqcv59nhXZ8=; b=F2mdNGkWSEAH73vw8AzX9O6hRodUiI66xPZ6Xh9uQCN8Fp9rf2TasLZHw7UwDR60vZ UQAuvQLmn5TfWoiwW3pI9/GHPqqrOboi4O7gGnkrkZS2rdJgEilqiaHIx/4yPR9baLGr SwwUKGZRANIH4GvWWYnZeZhPlBTE9XcYbqIENavoYgWgufJ3issbz69PWp97UYZby+Qn qp3Nd17tYDIYyKPHUgSkyXgZtLmzFc5GVICF+WnlEinweeQSDPRxU9Afb3tVRbeKYxEG MUXN6XumSoHnqF7MViiUEFcZZFkTlptDmiSSiF+83b2zGqPuvNXQaSQuA3UaY3/sgj8G QGBw== X-Gm-Message-State: AOJu0Yxaqlkjv946Ov9pIXMzRibfVg+rziJUkRUCJO2DSbmcExRM01jM pndGc0rwcHIOHXqjztvem+VQh6YmUokMkxINtaJvoXl3nXV8jrrAgWPUgdfXH3XV X-Gm-Gg: AY/fxX4CxJ7arOKdpQsMJj9YyOW2RC95io40VWTbL4E91NObpmYsmtJ8z1lszzadtbG IqJO5jZKdBc/bsovL6rA98hDAsMNEu1JqHZI/gkJ/4hdVv1Bx/IGD90GY/sIZd+s/5QUTzLCSTH W0zq6QXNKqEnmbxZLjhWMzgdtZ+zE8VhlbiEdcuetKmFNdoCDtBBkvTONtu+TI7xSI9BMFha/Dq cHz8NR6BaQkHVRgUwsnX0RKAHzfrm4AOh83gLySmr4NBlH7d3WH13k0PZ27w1VZdHVRjLL9XMp+ agLasKnFR1lx7+pCCUvQUpM3d/luL4a2ZdViUNL38Q9oEVZmP4njfWRYem0n7g8Bgu+nMXdphUD jIoq5/QLscLuMDOygnir4rd62xgKrtS+elRMDeimrO41SajHWeh3/hVhNLF6Fzn1cTIikPKQ7QM WRB2JE2m3oLcVsL3e3oST4nGOO2pka46EWUT45vKZTYqy8EL4fxw== X-Google-Smtp-Source: AGHT+IFIYgexYLtvwQ9yJNVnjoLIaGw019X7XPG0a0nl5dvH8I+lDrxqgPf3m5nWNXXMW2SsnWZdOQ== X-Received: by 2002:a17:907:2d27:b0:b72:7cd3:d55b with SMTP id a640c23a62f3a-b8036ece492mr3141069466b.12.1766912086141; Sun, 28 Dec 2025 00:54:46 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 9/9] bhyve: report domain capabilities for arm64 Date: Sun, 28 Dec 2025 09:51:12 +0100 Message-ID: <20251228085112.81805-10-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: S2QM4ETS5EWEDX4QBAIHIZV7JX5HULK4 X-Message-ID-Hash: S2QM4ETS5EWEDX4QBAIHIZV7JX5HULK4 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1766912984223158500 Content-Type: text/plain; charset="utf-8" Currently, domain capabilities reporting is limited to X86. Enable it for ARM as well. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4b1ca80fc6..cbcdc996dc 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1621,7 +1621,7 @@ bhyveConnectGetDomainCapabilities(virConnectPtr conn, goto cleanup; } =20 - if (!ARCH_IS_X86(arch)) { + if (!ARCH_IS_X86(arch) && !ARCH_IS_ARM(arch)) { virReportError(VIR_ERR_NO_SUPPORT, _("unsupported architecture: %1$s"), virArchToString(arch)); --=20 2.51.2