From nobody Thu Apr 25 16:39:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1641920479; cv=none; d=zohomail.com; s=zohoarc; b=hH5dK6JG9YohqyYFsFPeAHYS6TDf9xejBcrwRdhmG5Saqi6v27KsxO2+rtJsaZoIlRsW3NgOPpBycozm//qxCbqUcH0GyOuV4EUDeKec4iMu5F0IG/SvAuKcmwtA5pTer/36f0w2AiuMOsassRIhX0QC4OfIA9f0Ik8dMGLiy7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641920479; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sRuJ2tXmKQ2FJWk7YwYYBbsF0eUtgMvd7VxieiMOQls=; b=TUriWexht0xB2UlVH1rD6ls7qz0slqUo89MxnU7cfoUReDk/yXuOIlKJaMTWlvNh+7hcNMZpnfdqIGxUtzMFcWN3eaTpVywFdZbSvTmBqmFD7EWpaMfzybTmR1IdQq4tSkKmAWTe5q7V6alMqdsc0UWxDQMyhuUpWJhYH03JP5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1641920479091549.2032246115475; Tue, 11 Jan 2022 09:01:19 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-171-jF2CkYLINC6PY9oXd8P69Q-1; Tue, 11 Jan 2022 12:01:12 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30B5383DD22; Tue, 11 Jan 2022 17:01:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DEA8177F2C; Tue, 11 Jan 2022 17:01:05 +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 124561809CBA; Tue, 11 Jan 2022 17:01:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20BH13ra004196 for ; Tue, 11 Jan 2022 12:01:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5E03D7F81C; Tue, 11 Jan 2022 17:01:03 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8A6B7D57D; Tue, 11 Jan 2022 17:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641920478; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sRuJ2tXmKQ2FJWk7YwYYBbsF0eUtgMvd7VxieiMOQls=; b=GDU+ZvbQcJBiFTi0pX/ux2L+0w9PXYd/xYZzAKjnQwoF/25Le+snhTq3wxRwrosN/iZMPt P7kF2aIUKpzFa+kRRtXIq+XHsrp8wXWqN1pXzDRiUwDh+rBMkJ6/ddKlwYR82aLHGRrjYd EoyeTN+VC/If+j+qV6zbwj0mh6JGR5Y= X-MC-Unique: jF2CkYLINC6PY9oXd8P69Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] qemu: split handling of distinct firmware enum conversions Date: Tue, 11 Jan 2022 17:00:56 +0000 Message-Id: <20220111170056.203542-4-berrange@redhat.com> In-Reply-To: <20220111170056.203542-1-berrange@redhat.com> References: <20220111170056.203542-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1641920480413100001 The qemuFirmwareOSInterfaceTypeFromOsDefFirmware method was added to convert from virDomainOsDefFirmware to the qemuFirmwareOSInterface enum. It was later also used to convert from virDomainLoader to qemuFirmwareOSInterface in: commit 8e1804f9f66f13ca1412d22bf1a957b6d55a2365 Author: Michal Pr=C3=ADvozn=C3=ADk Date: Tue Dec 17 17:45:50 2019 +0100 qemu_firmware: Try to autofill for old style UEFI specification This caused compile errors with clang due to passing a mis-matched enum type. These were later silenced by stripping the enum types: commit 8fcee47807d29008632a7ad918cbe93ac0a20597 Author: Michal Pr=C3=ADvozn=C3=ADk Date: Wed Jan 8 09:42:47 2020 +0100 qemu_firmware: Accept int in qemuFirmwareOSInterfaceTypeFromOsDefFirmwa= re() This is still rather confusing to humans reading the code. It is clearer to just define a separate helper method for the virDomainLoader type conversion. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_firmware.c | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 144ba4dd12..8a7e9a1668 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2292,8 +2292,8 @@ struct _virDomainOSEnv { =20 typedef enum { VIR_DOMAIN_OS_DEF_FIRMWARE_NONE =3D 0, - VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS =3D VIR_DOMAIN_LOADER_TYPE_ROM, - VIR_DOMAIN_OS_DEF_FIRMWARE_EFI =3D VIR_DOMAIN_LOADER_TYPE_PFLASH, + VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS, + VIR_DOMAIN_OS_DEF_FIRMWARE_EFI, =20 VIR_DOMAIN_OS_DEF_FIRMWARE_LAST } virDomainOsDefFirmware; diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 529ab8d68e..84c80eaacb 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -899,7 +899,7 @@ qemuFirmwareMatchesMachineArch(const qemuFirmware *fw, =20 =20 static qemuFirmwareOSInterface -qemuFirmwareOSInterfaceTypeFromOsDefFirmware(int fw) +qemuFirmwareOSInterfaceTypeFromOsDefFirmware(virDomainOsDefFirmware fw) { switch (fw) { case VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS: @@ -915,6 +915,23 @@ qemuFirmwareOSInterfaceTypeFromOsDefFirmware(int fw) } =20 =20 +static qemuFirmwareOSInterface +qemuFirmwareOSInterfaceTypeFromOsDefLoaderType(virDomainLoader type) +{ + switch (type) { + case VIR_DOMAIN_LOADER_TYPE_ROM: + return QEMU_FIRMWARE_OS_INTERFACE_BIOS; + case VIR_DOMAIN_LOADER_TYPE_PFLASH: + return QEMU_FIRMWARE_OS_INTERFACE_UEFI; + case VIR_DOMAIN_LOADER_TYPE_NONE: + case VIR_DOMAIN_LOADER_TYPE_LAST: + break; + } + + return QEMU_FIRMWARE_OS_INTERFACE_NONE; +} + + #define VIR_QEMU_FIRMWARE_AMD_SEV_ES_POLICY (1 << 2) =20 =20 @@ -939,7 +956,7 @@ qemuFirmwareMatchDomain(const virDomainDef *def, =20 if (want =3D=3D QEMU_FIRMWARE_OS_INTERFACE_NONE && def->os.loader) { - want =3D qemuFirmwareOSInterfaceTypeFromOsDefFirmware(def->os.load= er->type); + want =3D qemuFirmwareOSInterfaceTypeFromOsDefLoaderType(def->os.lo= ader->type); =20 if (fw->mapping.device !=3D QEMU_FIRMWARE_DEVICE_FLASH || STRNEQ(def->os.loader->path, fw->mapping.data.flash.executable= .filename)) { --=20 2.33.1