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 2E54FC433E0 for ; Tue, 5 Jan 2021 11:04:33 +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 8EC31229C9 for ; Tue, 5 Jan 2021 11:04:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EC31229C9 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]:52116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwk8d-0004B2-IS for qemu-devel@archiver.kernel.org; Tue, 05 Jan 2021 06:04:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwk71-0003H4-O8 for qemu-devel@nongnu.org; Tue, 05 Jan 2021 06:02:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kwk6y-00076R-HI for qemu-devel@nongnu.org; Tue, 05 Jan 2021 06:02:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609844567; 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=8cu6HkCB5CpxmqJ03sR67WS1+WODTfgIc3D+gNm2MqU=; b=DlLS1CxYAqhvY3irSpi1LiMloliXk0ic3fLDgM5BzMlNakVof4YJTRSEIsSNUtEp1O+TFO +ERav6Y3Ik7R8w2SJmLCZUDBTbgP7dOy6dszlCn7IO7n6gu0zURIgSppWR+2JdT3GyUVOi v6uTOpCHJ88BfG7yJJAuzjCFLGNqZu4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-361-Qr684fsgPXaRuMQxFD0Yaw-1; Tue, 05 Jan 2021 06:02:46 -0500 X-MC-Unique: Qr684fsgPXaRuMQxFD0Yaw-1 Received: by mail-wm1-f72.google.com with SMTP id r1so1085509wmn.8 for ; Tue, 05 Jan 2021 03:02:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=mbl5QmC5aHI8ZfdwVbKvx4Xv3Z0CQD3R2rpo6FmAyfQ=; b=It1EocmX44yEReOZoajFPGRJYpRUfbYuhDjVgbCvFN5lwCpozTcrPamoB+O6jXDUlx bO4VMmBgzoIpOaCjowWD03eDSB8IT16cojo9BVog2u4S0R02C6hp7KbJfFWamd3Inuvt CPaKSa2HGQF/5FXlgH71Zp/2LUrkJ0H3vDu3sIYz+HRkRRjZ6qiEa0+U5I1zasjl6SGr TjdJ4f0glJxvcaXh4eIXsVacXQ3j6vy3vuUhvV6yoEWljBZlD+/u1Fe6MhIwAJMHWH5t sTiqus+v9syk9Gdkf5/61anuZCzIxi+EKN54DQgtXKDpUDIJrEL4Nz+IRo/D2hQCW9u9 uaMA== X-Gm-Message-State: AOAM533Z7QvzXnyolJeUJZ/r2wR+B2Ci67vcYWdX4OUYQdNNLkNTGHvB c1gkV7QezkKIljxFGtsgG+goTD+YHhSiYCg8E2VjG0NhBxwhmXbxzRfvT8PMahvsgYoFw/FPLKt I7KUV3L5dRKLYCig= X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr86763559wrx.164.1609844563876; Tue, 05 Jan 2021 03:02:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4hnw0cXfyXJO/q1XhDtqdY2vnBX0lFQZoDAbJmZgLdBPxSaHYmrKIJ6h9H7/q0eBZVqcyZw== X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr86763531wrx.164.1609844563667; Tue, 05 Jan 2021 03:02:43 -0800 (PST) Received: from redhat.com (bzq-79-178-32-166.red.bezeqint.net. [79.178.32.166]) by smtp.gmail.com with ESMTPSA id j2sm61399868wrh.78.2021.01.05.03.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 03:02:42 -0800 (PST) Date: Tue, 5 Jan 2021 06:02:39 -0500 From: "Michael S. Tsirkin" To: Eduardo Habkost Subject: Re: [PATCH v2 3/3] hw/i386: expose a "smbios-ep" PC machine property Message-ID: <20210105055815-mutt-send-email-mst@kernel.org> References: <20201214205029.2991222-1-ehabkost@redhat.com> <20201214205029.2991222-4-ehabkost@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201214205029.2991222-4-ehabkost@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@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" , Michael Roth , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Richard Henderson , qemu-devel@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov , Laszlo Ersek Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Dec 14, 2020 at 03:50:29PM -0500, Eduardo Habkost wrote: > From: Daniel P. Berrangé > > 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 > > EDK2, however, can also support SMBIOS 3.0 and QEMU already uses this on > the ARM virt machine type. > > This adds a property to allow the choice of SMBIOS entry point versions > For example to opt in to version 3.0 > > $QEMU -machine q35,smbios-ep=3_0 > > Signed-off-by: Daniel P. Berrangé > Signed-off-by: Eduardo Habkost Just one small point: wouldn't it be a good idea to eschew abbreviation here, and call the property smbios-entry-point or even smbios-entry-point-type or smbios-entry-point-version? > --- > This is patch was previously submitted at: > https://lore.kernel.org/qemu-devel/20200908165438.1008942-6-berrange@redhat.com > > 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(-) > > 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" > > #define HPET_INTCAP "hpet-intcap" > > @@ -38,6 +39,7 @@ typedef struct PCMachineState { > /* Configuration options: */ > uint64_t max_ram_below_4g; > OnOffAuto vmport; > + SmbiosEntryPointType smbios_ep; > > 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" > > /** > * 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 = value; > } > > +static void pc_machine_get_smbios_ep(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + PCMachineState *pcms = PC_MACHINE(obj); > + SmbiosEntryPointType smbios_ep = 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 = 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 *opaque, > Error **errp) > @@ -1621,6 +1639,8 @@ static void pc_machine_initfn(Object *obj) > pcms->vmport = ON_OFF_AUTO_OFF; > #endif /* CONFIG_VMPORT */ > pcms->max_ram_below_4g = 0; /* use default */ > + pcms->smbios_ep = SMBIOS_ENTRY_POINT_TYPE_2_1; > + > /* acpi build is enabled by default if machine supports it */ > pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build; > pcms->smbus_enabled = 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]"); To me this reads like the legal values are v2_1 and v3_0, in fact they are 2_1 and 3_0. > } > > static const TypeInfo pc_machine_info = { > 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); > } > > /* 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); > } > > /* allocate ram and load rom/bios */ > -- > 2.28.0