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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 229A3C433EF for ; Wed, 27 Oct 2021 07:45:09 +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 8265A6109E for ; Wed, 27 Oct 2021 07:45:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8265A6109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:59902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfdcR-0007aJ-CY for qemu-devel@archiver.kernel.org; Wed, 27 Oct 2021 03:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfdbJ-0006kE-Fl for qemu-devel@nongnu.org; Wed, 27 Oct 2021 03:43:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfdbF-0008QU-W3 for qemu-devel@nongnu.org; Wed, 27 Oct 2021 03:43:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635320632; 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=ree+Ziao87VRUahkx+qNQl5nVyP4F03RxZQ05SQCqzU=; b=Tx5JTG0A4eM8Uc0iK89SRjmTB+QLj3HfDI4nCSIz+eqkqaF6oswjwlFxIqzynjlvrxL7Uj PbhuPfPHocHSpGMIrHBeFH+Ah8wtyTntAfi4SBhbSDQ9yVEU5UXhYZI0OoE7V3zdEXXIMa Clb7G8i1ek5Tp1971CmVv+4mcDEDUNM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-MH6AoUMhMLmvo7YOtsYMxw-1; Wed, 27 Oct 2021 03:43:51 -0400 X-MC-Unique: MH6AoUMhMLmvo7YOtsYMxw-1 Received: by mail-wr1-f72.google.com with SMTP id v15-20020adfa1cf000000b00160940b17a2so334168wrv.19 for ; Wed, 27 Oct 2021 00:43:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=ree+Ziao87VRUahkx+qNQl5nVyP4F03RxZQ05SQCqzU=; b=ZzFZDv1gWuIVtRXW3Ql5PKE6F4RiOaCigfw3R3ljvaut1bpi00RLawGJgEguxN8snV iNJ9drl72igOXudjxgPdDC2QbBO33tgxLeScsUlAAxbUZjqzX59s66hSy/TJKQTrcL8M RMTJDUGuw+IDKt9itgp0f3pmRYyJktLb15ZBJrfIfinrOmuiml9YFR5UcC3Qw6Cwt8lc vn1y35M/sRktsbwGXZkP4qbP0Rc0UaAqBTrHnbcWFHmXsg1bo8EfBGdswgfLfIbq4JTe 7+1EIYunXpgeY1nrgl0ZcTFMIx7vh2vL92i0g2rlTHM2fEv86ypvWdfUs8zG5HMz0Ihj cwXQ== X-Gm-Message-State: AOAM530er9Ul8s9qTHGUtsxSwyl0KDa2m8mI3cJgQO7qLlRJIBb7sN/N 5I3FDF0UzULwH8svCuWefmRIK7yQ950tzxcnA7riW+yhaJ7s5JDR8iRNmoMTPk9OP1/4G6bVRV1 SPZ9/01haAxTlg7k= X-Received: by 2002:a1c:730b:: with SMTP id d11mr4012690wmb.17.1635320629792; Wed, 27 Oct 2021 00:43:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAywHfzWU+Mi8xdu9IN4fO6r/V1+zEKgiAzpKFecTljRQaHupHiM8c4QSZsCthLjhMa1Paew== X-Received: by 2002:a1c:730b:: with SMTP id d11mr4012655wmb.17.1635320629513; Wed, 27 Oct 2021 00:43:49 -0700 (PDT) Received: from redhat.com ([2a03:c5c0:207e:a543:72f:c4d1:8911:6346]) by smtp.gmail.com with ESMTPSA id r11sm6408732wrx.79.2021.10.27.00.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 00:43:48 -0700 (PDT) Date: Wed, 27 Oct 2021 03:43:43 -0400 From: "Michael S. Tsirkin" To: Eduardo Habkost Subject: Re: [PATCH v3 1/3] smbios: Rename SMBIOS_ENTRY_POINT_* enums Message-ID: <20211027034303-mutt-send-email-mst@kernel.org> References: <20211026151100.1691925-1-ehabkost@redhat.com> <20211026151100.1691925-2-ehabkost@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211026151100.1691925-2-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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-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 , Eric Blake , Richard Henderson , qemu-devel@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Ani Sinha , Igor Mammedov , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Oct 26, 2021 at 11:10:58AM -0400, Eduardo Habkost wrote: > Rename the enums to match the naming style used by QAPI, and to > use "32" and "64" instead of "20" and "31". This will allow us > to more easily move the enum to the QAPI schema later. > > About the naming choice: "SMBIOS 2.1 entry point"/"SMBIO 3.0 typo in commit log > entry point" and "32-bit entry point"/"64-bit entry point" are > synonymous in the SMBIOS specification. However, the phrases > "32-bit entry point" and "64-bit entry point" are used more often. > > The new names also avoid confusion between the entry point format > and the actual SMBIOS version reported in the entry point > structure. For example: currently the 32-bit entry point > actually report SMBIOS 2.8 support, not 2.1. > > Based on portions of a patch submitted by Daniel P. Berrangé. I think you need the original S.O.B here too then. > > Signed-off-by: Eduardo Habkost > --- > First version of this code was submitted at: > https://lore.kernel.org/qemu-devel/20200908165438.1008942-5-berrange@redhat.com > > Changes from v2: > * Use "32" and "64" instead of "2_0" and "3_1" > > Changes from v1: > * Patch was split in two > * Hunks included this patch are not changed from v1 > --- > include/hw/firmware/smbios.h | 4 ++-- > hw/arm/virt.c | 2 +- > hw/i386/pc_piix.c | 2 +- > hw/i386/pc_q35.c | 2 +- > hw/smbios/smbios.c | 8 ++++---- > 5 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h > index 5a0dd0c8cff..d916baed6a9 100644 > --- a/include/hw/firmware/smbios.h > +++ b/include/hw/firmware/smbios.h > @@ -27,8 +27,8 @@ struct smbios_phys_mem_area { > * SMBIOS spec defined tables > */ > typedef enum SmbiosEntryPointType { > - SMBIOS_ENTRY_POINT_21, > - SMBIOS_ENTRY_POINT_30, > + SMBIOS_ENTRY_POINT_TYPE_32, > + SMBIOS_ENTRY_POINT_TYPE_64, > } SmbiosEntryPointType; > > /* SMBIOS Entry Point > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index ca433adb5b1..2bd73d501da 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1589,7 +1589,7 @@ static void virt_build_smbios(VirtMachineState *vms) > > smbios_set_defaults("QEMU", product, > vmc->smbios_old_sys_ver ? "1.0" : mc->name, false, > - true, SMBIOS_ENTRY_POINT_30); > + true, SMBIOS_ENTRY_POINT_TYPE_64); > > smbios_get_tables(MACHINE(vms), NULL, 0, > &smbios_tables, &smbios_tables_len, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 6ad0d763c57..17c050694f5 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -177,7 +177,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_21); > + SMBIOS_ENTRY_POINT_TYPE_32); > } > > /* allocate ram and load rom/bios */ > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index fcc6e4eb2b8..48419ebfd5f 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -199,7 +199,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_21); > + SMBIOS_ENTRY_POINT_TYPE_32); > } > > /* allocate ram and load rom/bios */ > diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c > index 7397e567373..6013df1698e 100644 > --- a/hw/smbios/smbios.c > +++ b/hw/smbios/smbios.c > @@ -62,7 +62,7 @@ uint8_t *smbios_tables; > size_t smbios_tables_len; > unsigned smbios_table_max; > unsigned smbios_table_cnt; > -static SmbiosEntryPointType smbios_ep_type = SMBIOS_ENTRY_POINT_21; > +static SmbiosEntryPointType smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_32; > > static SmbiosEntryPoint ep; > > @@ -432,7 +432,7 @@ static void smbios_validate_table(MachineState *ms) > exit(1); > } > > - if (smbios_ep_type == SMBIOS_ENTRY_POINT_21 && > + if (smbios_ep_type == SMBIOS_ENTRY_POINT_TYPE_32 && > smbios_tables_len > SMBIOS_21_MAX_TABLES_LEN) { > error_report("SMBIOS 2.1 table length %zu exceeds %d", > smbios_tables_len, SMBIOS_21_MAX_TABLES_LEN); > @@ -927,7 +927,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product, > static void smbios_entry_point_setup(void) > { > switch (smbios_ep_type) { > - case SMBIOS_ENTRY_POINT_21: > + case SMBIOS_ENTRY_POINT_TYPE_32: > memcpy(ep.ep21.anchor_string, "_SM_", 4); > memcpy(ep.ep21.intermediate_anchor_string, "_DMI_", 5); > ep.ep21.length = sizeof(struct smbios_21_entry_point); > @@ -950,7 +950,7 @@ static void smbios_entry_point_setup(void) > ep.ep21.structure_table_address = cpu_to_le32(0); > > break; > - case SMBIOS_ENTRY_POINT_30: > + case SMBIOS_ENTRY_POINT_TYPE_64: > memcpy(ep.ep30.anchor_string, "_SM3_", 5); > ep.ep30.length = sizeof(struct smbios_30_entry_point); > ep.ep30.entry_point_revision = 1; > -- > 2.32.0