SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/smbios: Use qapi for SmbiosEntryPointType

Browse Source 
This prepares for exposing the SMBIOS entry point type as a
machine property on x86.

Based on a patch from Daniel P. Berrangé.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20211026151100.1691925-3-ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eduardo Habkost 2021-10-26 11:10:59 -04:00 committed by Michael S. Tsirkin
parent 10be11d0b4
commit bdf54a9a7b
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/hw/firmware/smbios.h
View File

@ -1,6 +1,8 @@
#ifndef QEMU_SMBIOS_H #ifndef QEMU_SMBIOS_H
#define QEMU_SMBIOS_H #define QEMU_SMBIOS_H
#include "qapi/qapi-types-machine.h"
/* /*
* SMBIOS Support * SMBIOS Support
* *
@ -23,14 +25,6 @@ struct smbios_phys_mem_area {
uint64_t length; uint64_t length;
}; };
/*
* SMBIOS spec defined tables
*/
typedef enum SmbiosEntryPointType {
SMBIOS_ENTRY_POINT_TYPE_32,
SMBIOS_ENTRY_POINT_TYPE_64,
} SmbiosEntryPointType;
/* SMBIOS Entry Point /* SMBIOS Entry Point
* There are two types of entry points defined in the SMBIOS specification * 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 * (see below). BIOS must place the entry point(s) at a 16-byte-aligned

12
qapi/machine.json
View File

@ -1568,3 +1568,15 @@
{ 'command': 'x-query-usb', { 'command': 'x-query-usb',
'returns': 'HumanReadableText', 'returns': 'HumanReadableText',
'features': [ 'unstable' ] } 'features': [ 'unstable' ] }
##
# @SmbiosEntryPointType:
#
# @32: SMBIOS version 2.1 (32-bit) Entry Point
#
# @64: SMBIOS version 3.0 (64-bit) Entry Point
#
# Since: 7.0
##
{ 'enum': 'SmbiosEntryPointType',
'data': [ '32', '64' ] }