motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: rename oem-id and oem-table-id properties

Browse source 
After introducing non-scalar machine properties, it would be preferrable
to have a single acpitable property which includes both generic
information (such as the OEM ids) and custom tables currently
passed via -acpitable.

Do not saddle ourselves with legacy oem-id and oem-table-id
properties, instead mark them as experimental.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210402082128.13854-1-pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-04-02 10:21:28 +02:00 • committed by Michael S. Tsirkin
parent 11577d85b1
commit 90a66f4847
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/arm/virt.c
View file

@ -2670,19 +2670,19 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
"Set on/off to enable/disable " "Set on/off to enable/disable "
"ITS instantiation"); "ITS instantiation");
object_class_property_add_str(oc, "oem-id", object_class_property_add_str(oc, "x-oem-id",
virt_get_oem_id, virt_get_oem_id,
virt_set_oem_id); virt_set_oem_id);
object_class_property_set_description(oc, "oem-id", object_class_property_set_description(oc, "x-oem-id",
"Override the default value of field OEMID " "Override the default value of field OEMID "
"in ACPI table header." "in ACPI table header."
"The string may be up to 6 bytes in size"); "The string may be up to 6 bytes in size");
object_class_property_add_str(oc, "oem-table-id", object_class_property_add_str(oc, "x-oem-table-id",
virt_get_oem_table_id, virt_get_oem_table_id,
virt_set_oem_table_id); virt_set_oem_table_id);
object_class_property_set_description(oc, "oem-table-id", object_class_property_set_description(oc, "x-oem-table-id",
"Override the default value of field OEM Table ID " "Override the default value of field OEM Table ID "
"in ACPI table header." "in ACPI table header."
"The string may be up to 8 bytes in size"); "The string may be up to 8 bytes in size");

4
include/hw/i386/x86.h
View file

@ -78,8 +78,8 @@ struct X86MachineState {
#define X86_MACHINE_SMM "smm" #define X86_MACHINE_SMM "smm"
#define X86_MACHINE_ACPI "acpi" #define X86_MACHINE_ACPI "acpi"
#define X86_MACHINE_OEM_ID "oem-id" #define X86_MACHINE_OEM_ID "x-oem-id"
#define X86_MACHINE_OEM_TABLE_ID "oem-table-id" #define X86_MACHINE_OEM_TABLE_ID "x-oem-table-id"
#define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86") #define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86")
OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE) OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE)

2
tests/qtest/bios-tables-test.c
View file

@ -73,7 +73,7 @@
#define OEM_ID "TEST" #define OEM_ID "TEST"
#define OEM_TABLE_ID "OEM" #define OEM_TABLE_ID "OEM"
#define OEM_TEST_ARGS "-machine oem-id="OEM_ID",oem-table-id="OEM_TABLE_ID #define OEM_TEST_ARGS "-machine x-oem-id="OEM_ID",x-oem-table-id="OEM_TABLE_ID
typedef struct { typedef struct {
bool tcg_only; bool tcg_only;