From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 884F0C433E0 for ; Mon, 4 Jan 2021 22:47:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3E492251F for ; Mon, 4 Jan 2021 22:47:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3E492251F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwYdj-0008Tl-1r for qemu-devel@archiver.kernel.org; Mon, 04 Jan 2021 17:47:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwYav-0007KZ-U0 for qemu-devel@nongnu.org; Mon, 04 Jan 2021 17:44:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kwYar-0002tu-5N for qemu-devel@nongnu.org; Mon, 04 Jan 2021 17:44:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609800291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DPSU4RfLlMfVmTuHkZt3krQO84SIfrjmyUkgiA27jE8=; b=BkRtX679UoRCHyxwjYAlmwP2K+Bw4VXm72rCbm3JwzAgwWl8173wGhAhAbFgxGP4vbrpMw WZOG9N+B0LEAhi/ZM4TIhJ69Z9sUg5/xJM0O+zgmXKagopXsRzwj1Ky70yVndijxUjiTtf 66QPAewUiZUevOgReUCjvlIZRTQr3J4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-50gZDxyPOpC1L-ahRxkO0Q-1; Mon, 04 Jan 2021 17:44:50 -0500 X-MC-Unique: 50gZDxyPOpC1L-ahRxkO0Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A208D801A9D; Mon, 4 Jan 2021 22:44:48 +0000 (UTC) Received: from localhost (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9438610027A5; Mon, 4 Jan 2021 22:44:42 +0000 (UTC) Date: Mon, 4 Jan 2021 23:44:40 +0100 From: Igor Mammedov To: Eduardo Habkost Subject: Re: [PATCH v2 3/3] hw/i386: expose a "smbios-ep" PC machine property Message-ID: <20210104234440.2da6c503@redhat.com> In-Reply-To: <20201214205029.2991222-4-ehabkost@redhat.com> References: <20201214205029.2991222-1-ehabkost@redhat.com> <20201214205029.2991222-4-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Daniel P. Berrange" , Laszlo Ersek , "Michael S. Tsirkin" , Markus Armbruster , Richard Henderson , qemu-devel@nongnu.org, Michael Roth , qemu-arm@nongnu.org, Paolo Bonzini , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 14 Dec 2020 15:50:29 -0500 Eduardo Habkost wrote: > From: Daniel P. Berrang=C3=A9 >=20 > The i440fx and Q35 machine types are both hardcoded to use the legacy > SMBIOS 2.1 entry point. This is a sensible conservative choice because > SeaBIOS only supports SMBIOS 2.1 >=20 > EDK2, however, can also support SMBIOS 3.0 and QEMU already uses this on > the ARM virt machine type. >=20 > This adds a property to allow the choice of SMBIOS entry point versions > For example to opt in to version 3.0 >=20 > $QEMU -machine q35,smbios-ep=3D3_0 >=20 > Signed-off-by: Daniel P. Berrang=C3=A9 > Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov > --- > This is patch was previously submitted at: > https://lore.kernel.org/qemu-devel/20200908165438.1008942-6-berrange@redh= at.com >=20 > Changes from v1: > * Include qapi-visit-smbios.h instead of qapi-visit-machine.h > * Commit message fix: s/smbios_ep/smbios-ep/ > --- > include/hw/i386/pc.h | 3 +++ > hw/i386/pc.c | 26 ++++++++++++++++++++++++++ > hw/i386/pc_piix.c | 2 +- > hw/i386/pc_q35.c | 2 +- > 4 files changed, 31 insertions(+), 2 deletions(-) >=20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 2aa8797c6e..2075093b32 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -11,6 +11,7 @@ > #include "hw/acpi/acpi_dev_interface.h" > #include "hw/hotplug.h" > #include "qom/object.h" > +#include "hw/firmware/smbios.h" > =20 > #define HPET_INTCAP "hpet-intcap" > =20 > @@ -38,6 +39,7 @@ typedef struct PCMachineState { > /* Configuration options: */ > uint64_t max_ram_below_4g; > OnOffAuto vmport; > + SmbiosEntryPointType smbios_ep; > =20 > bool acpi_build_enabled; > bool smbus_enabled; > @@ -62,6 +64,7 @@ typedef struct PCMachineState { > #define PC_MACHINE_SATA "sata" > #define PC_MACHINE_PIT "pit" > #define PC_MACHINE_MAX_FW_SIZE "max-fw-size" > +#define PC_MACHINE_SMBIOS_EP "smbios-ep" > =20 > /** > * PCMachineClass: > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 640fb5b0b7..3cc559e0d9 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -81,6 +81,7 @@ > #include "hw/mem/nvdimm.h" > #include "qapi/error.h" > #include "qapi/qapi-visit-common.h" > +#include "qapi/qapi-visit-smbios.h" > #include "qapi/visitor.h" > #include "hw/core/cpu.h" > #include "hw/usb.h" > @@ -1532,6 +1533,23 @@ static void pc_machine_set_hpet(Object *obj, bool = value, Error **errp) > pcms->hpet_enabled =3D value; > } > =20 > +static void pc_machine_get_smbios_ep(Object *obj, Visitor *v, const char= *name, > + void *opaque, Error **errp) > +{ > + PCMachineState *pcms =3D PC_MACHINE(obj); > + SmbiosEntryPointType smbios_ep =3D pcms->smbios_ep; > + > + visit_type_SmbiosEntryPointType(v, name, &smbios_ep, errp); > +} > + > +static void pc_machine_set_smbios_ep(Object *obj, Visitor *v, const char= *name, > + void *opaque, Error **errp) > +{ > + PCMachineState *pcms =3D PC_MACHINE(obj); > + > + visit_type_SmbiosEntryPointType(v, name, &pcms->smbios_ep, errp); > +} > + > static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v, > const char *name, void *opaq= ue, > Error **errp) > @@ -1621,6 +1639,8 @@ static void pc_machine_initfn(Object *obj) > pcms->vmport =3D ON_OFF_AUTO_OFF; > #endif /* CONFIG_VMPORT */ > pcms->max_ram_below_4g =3D 0; /* use default */ > + pcms->smbios_ep =3D SMBIOS_ENTRY_POINT_TYPE_2_1; > + > /* acpi build is enabled by default if machine supports it */ > pcms->acpi_build_enabled =3D PC_MACHINE_GET_CLASS(pcms)->has_acpi_bu= ild; > pcms->smbus_enabled =3D true; > @@ -1759,6 +1779,12 @@ static void pc_machine_class_init(ObjectClass *oc,= void *data) > NULL, NULL); > object_class_property_set_description(oc, PC_MACHINE_MAX_FW_SIZE, > "Maximum combined firmware size"); > + > + object_class_property_add(oc, PC_MACHINE_SMBIOS_EP, "str", > + pc_machine_get_smbios_ep, pc_machine_set_smbios_ep, > + NULL, NULL); > + object_class_property_set_description(oc, PC_MACHINE_SMBIOS_EP, > + "SMBIOS Entry Point version [v2_1, v3_0]"); > } > =20 > static const TypeInfo pc_machine_info =3D { > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 08b82df4d1..30ae7f27af 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -179,7 +179,7 @@ static void pc_init1(MachineState *machine, > smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)", > mc->name, pcmc->smbios_legacy_mode, > pcmc->smbios_uuid_encoded, > - SMBIOS_ENTRY_POINT_TYPE_2_1); > + pcms->smbios_ep); > } > =20 > /* allocate ram and load rom/bios */ > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index f71b1e2dcf..9974426806 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -198,7 +198,7 @@ static void pc_q35_init(MachineState *machine) > smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)", > mc->name, pcmc->smbios_legacy_mode, > pcmc->smbios_uuid_encoded, > - SMBIOS_ENTRY_POINT_TYPE_2_1); > + pcms->smbios_ep); > } > =20 > /* allocate ram and load rom/bios */