From nobody Fri Jan 9 08:45:33 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 --- 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