From nobody Sun Feb 8 21:48:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554448847086303.81292150030356; Fri, 5 Apr 2019 00:20:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C9A8030C8484; Fri, 5 Apr 2019 07:20:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7DC245D9E2; Fri, 5 Apr 2019 07:20:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 423FF3FB14; Fri, 5 Apr 2019 07:20:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x357JwNI027679 for ; Fri, 5 Apr 2019 03:19:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 077BC5D719; Fri, 5 Apr 2019 07:19:58 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5151C5D756; Fri, 5 Apr 2019 07:19:57 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 5 Apr 2019 09:19:47 +0200 Message-Id: <1a11fb963ac691c11da8eecc22b4c2cc541f8c00.1554448728.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: lersek@redhat.com Subject: [libvirt] [PATCH v1 3/4] qemu_firmware: Introduce qemuFirmwareGetSupported X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 05 Apr 2019 07:20:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The point of this API is to fetch all FW descriptors, parse them and return list of supported interfaces for given combination of machine type and guest architecture. Signed-off-by: Michal Privoznik --- src/qemu/qemu_firmware.c | 51 ++++++++++++++++++++++++++++++++++- src/qemu/qemu_firmware.h | 9 +++++++ tests/qemufirmwaretest.c | 58 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 8e9a225982..07ac47c62b 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1349,7 +1349,8 @@ qemuFirmwareFetchParsedConfigs(bool privileged, } =20 VIR_STEAL_PTR(*firmwaresRet, firmwares); - VIR_STEAL_PTR(*pathsRet, paths); + if (pathsRet) + VIR_STEAL_PTR(*pathsRet, paths); return npaths; =20 error: @@ -1415,3 +1416,51 @@ qemuFirmwareFillDomain(virQEMUDriverPtr driver, VIR_FREE(firmwares); return ret; } + + +int +qemuFirmwareGetSupported(const char *machine, + virArch arch, + bool privileged, + unsigned int *supported) +{ + qemuFirmwarePtr *firmwares =3D NULL; + ssize_t nfirmwares =3D 0; + size_t i; + + *supported =3D VIR_DOMAIN_OS_DEF_FIRMWARE_NONE; + + if ((nfirmwares =3D qemuFirmwareFetchParsedConfigs(privileged, + &firmwares, NULL)) < = 0) + return -1; + + for (i =3D 0; i < nfirmwares; i++) { + qemuFirmwarePtr fw =3D firmwares[i]; + size_t j; + + if (!qemuFirmwareMatchesMachineArch(fw, machine, arch)) + continue; + + for (j =3D 0; j < fw->ninterfaces; j++) { + switch (fw->interfaces[j]) { + case QEMU_FIRMWARE_OS_INTERFACE_UEFI: + *supported |=3D (1 << VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); + break; + case QEMU_FIRMWARE_OS_INTERFACE_BIOS: + *supported |=3D (1 << VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS); + break; + case QEMU_FIRMWARE_OS_INTERFACE_NONE: + case QEMU_FIRMWARE_OS_INTERFACE_OPENFIRMWARE: + case QEMU_FIRMWARE_OS_INTERFACE_UBOOT: + case QEMU_FIRMWARE_OS_INTERFACE_LAST: + default: + break; + } + } + } + + for (i =3D 0; i < nfirmwares; i++) + qemuFirmwareFree(firmwares[i]); + VIR_FREE(firmwares); + return 0; +} diff --git a/src/qemu/qemu_firmware.h b/src/qemu/qemu_firmware.h index 7f8a0e4a15..0be5284ac1 100644 --- a/src/qemu/qemu_firmware.h +++ b/src/qemu/qemu_firmware.h @@ -24,6 +24,7 @@ # include "domain_conf.h" # include "viralloc.h" # include "qemu_conf.h" +# include "virarch.h" =20 typedef struct _qemuFirmware qemuFirmware; typedef qemuFirmware *qemuFirmwarePtr; @@ -48,4 +49,12 @@ qemuFirmwareFillDomain(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags); =20 +int +qemuFirmwareGetSupported(const char *machine, + virArch arch, + bool privileged, + unsigned int *supported); + +verify(sizeof(unsigned int) >=3D ((1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_LAST= ) >> 2)); + #endif /* LIBVIRT_QEMU_FIRMWARE_H */ diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 2b5cbf649b..9e9dfd9b1b 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -99,6 +99,42 @@ testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED) } =20 =20 +struct supportedData { + const char *machine; + virArch arch; + unsigned int *interfaces; + size_t ninterfaces; +}; + + +static int +testSupportedFW(const void *opaque) +{ + const struct supportedData *data =3D opaque; + unsigned int actual; + unsigned int expected =3D 0; + size_t i; + + for (i =3D 0; i < data->ninterfaces; i++) + expected |=3D (1 << data->interfaces[i]); + + if (qemuFirmwareGetSupported(data->machine, data->arch, false, &actual= ) < 0) { + fprintf(stderr, "Unable to get list of supported interfaces\n"); + return -1; + } + + if (actual !=3D expected) { + fprintf(stderr, + "Mismatch in supported interfaces. " + "Expected 0x%x got 0x%x\n", + expected, actual); + return -1; + } + + return 0; +} + + static int mymain(void) { @@ -127,6 +163,28 @@ mymain(void) if (virTestRun("QEMU FW precedence test", testFWPrecedence, NULL) < 0) ret =3D -1; =20 +#define DO_SUPPORTED_TEST(machine, arch, ...) \ + do { \ + unsigned int interfaces[] =3D {__VA_ARGS__}; \ + struct supportedData data =3D {machine, arch, interfaces, ARRAY_CA= RDINALITY(interfaces)}; \ + if (virTestRun("QEMU FW SUPPORTED " machine " " #arch, \ + testSupportedFW, &data) < 0) \ + ret =3D -1; \ + } while (0) + + DO_SUPPORTED_TEST("pc-i440fx-3.1", VIR_ARCH_X86_64, + VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS, + VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); + DO_SUPPORTED_TEST("pc-i440fx-3.1", VIR_ARCH_I686, + VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS); + DO_SUPPORTED_TEST("pc-q35-3.1", VIR_ARCH_X86_64, + VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS, + VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); + DO_SUPPORTED_TEST("pc-q35-3.1", VIR_ARCH_I686, + VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS); + DO_SUPPORTED_TEST("virt-3.1", VIR_ARCH_AARCH64, + VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); + virFileWrapperClearPrefixes(); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list