From nobody Tue Nov 18 07:47:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607979260; cv=none; d=zohomail.com; s=zohoarc; b=DwxDBFHW5O4+JQ+T7Utiy3So0Sryk8wgMDeJs8v4cxxrKFXRYnUNEden/VrEkJhixvSQkEG232Wu/NAcck9LPo85tIBCtUlh6qTg2eU2clKeawu9JiK2M2LTrbsC/r8JrgghbLYkMyW5C4IZr7xk+UmqEMezdwqXrQJRsnztI5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607979260; h=Content-Type:Content-Transfer-Encoding:Cc: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=rfaEH6sgDHoSlrILw4Wuv5je3FxkaJ8a2vJZFK/cGs8=; b=YAyyjdPHdA3CLulfasFqeBHjPYz49U3V1G4njpbWqaCGPOWvaLFvcBWp2XoTdhUTEKE56PBeioZHDlF/j7lgoDNHUfBxXDVQWofOZvBDa6WdOFJ1HiEzkMB3UggucprxCc346GMsFtPsaT8i2LH9nXRnv2nIoAtgvi7ekF3yO+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607979260573312.62861627871746; Mon, 14 Dec 2020 12:54:20 -0800 (PST) Received: from localhost ([::1]:56282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kourL-0002l2-Ie for importer@patchew.org; Mon, 14 Dec 2020 15:54:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kounz-0006HV-JB for qemu-devel@nongnu.org; Mon, 14 Dec 2020 15:50:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kounv-0001gf-Df for qemu-devel@nongnu.org; Mon, 14 Dec 2020 15:50:51 -0500 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-105-Dn-pCn3gMZaWg7eaSyo-og-1; Mon, 14 Dec 2020 15:50:42 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4225B8143E5; Mon, 14 Dec 2020 20:50:41 +0000 (UTC) Received: from localhost (ovpn-116-160.rdu2.redhat.com [10.10.116.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0196760BE2; Mon, 14 Dec 2020 20:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607979046; 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=rfaEH6sgDHoSlrILw4Wuv5je3FxkaJ8a2vJZFK/cGs8=; b=IDFvDl63Vylgdmy9CU7KAhA0U+KzO5uzLcffk25g/+IN1z+eOQvT+fGQK4NfMznC0RHpDg 7FWG4pWjJ0NwCI4YJ+bYvx8+oTnt3KTNh97KWK5toucsGcLkUSELDKDF3DsIe/9ZwFF2In P6YLiUqwb/RHGxiD29qeKieTD4TuGvA= X-MC-Unique: Dn-pCn3gMZaWg7eaSyo-og-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] hw/smbios: Use qapi for SmbiosEntryPointType Date: Mon, 14 Dec 2020 15:50:28 -0500 Message-Id: <20201214205029.2991222-3-ehabkost@redhat.com> In-Reply-To: <20201214205029.2991222-1-ehabkost@redhat.com> References: <20201214205029.2991222-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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" , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Michael Roth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This prepares for exposing the SMBIOS entry point type as a machine property on x86. Based on a patch from Daniel P. Berrang=C3=A9. Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov --- First version of this code was submitted at: https://lore.kernel.org/qemu-devel/20200908165438.1008942-5-berrange@redhat= .com Changes from v1: * Patch was split in two * Declarations were moved to qapi/smbios.json * Documentation was updated to use the same terminology used in SMBIOS documentation * Documentation was updated to "Since: 6.0" --- qapi/qapi-schema.json | 1 + qapi/smbios.json | 11 +++++++++++ include/hw/firmware/smbios.h | 10 ++-------- qapi/meson.build | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 qapi/smbios.json diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 0b444b76d2..87a183fb13 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -86,6 +86,7 @@ { 'include': 'machine.json' } { 'include': 'machine-target.json' } { 'include': 'replay.json' } +{ 'include': 'smbios.json' } { 'include': 'misc.json' } { 'include': 'misc-target.json' } { 'include': 'audio.json' } diff --git a/qapi/smbios.json b/qapi/smbios.json new file mode 100644 index 0000000000..55b3bd2e83 --- /dev/null +++ b/qapi/smbios.json @@ -0,0 +1,11 @@ +## +# @SmbiosEntryPointType: +# +# @2_1: SMBIOS version 2.1 (32-bit) Entry Point +# +# @3_0: SMBIOS version 3.0 (64-bit) Entry Point +# +# Since: 6.0 +## +{ 'enum': 'SmbiosEntryPointType', + 'data': [ '2_1', '3_0' ] } diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h index 5467ecec78..b3beef1606 100644 --- a/include/hw/firmware/smbios.h +++ b/include/hw/firmware/smbios.h @@ -1,6 +1,8 @@ #ifndef QEMU_SMBIOS_H #define QEMU_SMBIOS_H =20 +#include "qapi/qapi-types-smbios.h" + /* * SMBIOS Support * @@ -23,14 +25,6 @@ struct smbios_phys_mem_area { uint64_t length; }; =20 -/* - * SMBIOS spec defined tables - */ -typedef enum SmbiosEntryPointType { - SMBIOS_ENTRY_POINT_TYPE_2_1, - SMBIOS_ENTRY_POINT_TYPE_3_0, -} SmbiosEntryPointType; - /* SMBIOS Entry Point * There are two types of entry points defined in the SMBIOS specification * (see below). BIOS must place the entry point(s) at a 16-byte-aligned diff --git a/qapi/meson.build b/qapi/meson.build index 0e98146f1f..f7fb73d41b 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -42,6 +42,7 @@ qapi_all_modules =3D [ 'replay', 'rocker', 'run-state', + 'smbios', 'sockets', 'tpm', 'trace', --=20 2.28.0