diff options
| author | Sunil V L <sunilvl@ventanamicro.com> | 2023-03-02 14:42:05 +0530 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2023-03-06 11:35:02 -0800 |
| commit | 90477a652b6389aca542f663e4832e8bfb8a7356 (patch) | |
| tree | 6e67c4fd2772c948c4e0fdfa104cf3fbb2bed12b | |
| parent | ed9eb206942e31abbc593a4bfe8bb97f5fb5d551 (diff) | |
| download | qemu-90477a652b6389aca542f663e4832e8bfb8a7356.zip qemu-90477a652b6389aca542f663e4832e8bfb8a7356.tar.gz qemu-90477a652b6389aca542f663e4832e8bfb8a7356.tar.bz2 | |
hw/riscv/virt: Add OEM_ID and OEM_TABLE_ID fields
ACPI needs OEM_ID and OEM_TABLE_ID for the machine. Add these fields
in the RISCVVirtState structure and initialize with default values.
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Bin Meng <bmeng@tinylab.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Message-ID: <20230302091212.999767-2-sunilvl@ventanamicro.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
| -rw-r--r-- | hw/riscv/virt.c | 5 | ||||
| -rw-r--r-- | include/hw/riscv/virt.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 26eb81d..5a05948 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -49,6 +49,7 @@ #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" #include "hw/display/ramfb.h" +#include "hw/acpi/aml-build.h" /* * The virt machine physical address space used by some of the devices @@ -1528,6 +1529,10 @@ static void virt_machine_init(MachineState *machine) static void virt_machine_instance_init(Object *obj) { + RISCVVirtState *s = RISCV_VIRT_MACHINE(obj); + + s->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6); + s->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); } static char *virt_get_aia_guests(Object *obj, Error **errp) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index b3d2613..6c7885b 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -56,6 +56,8 @@ struct RISCVVirtState { bool have_aclint; RISCVVirtAIAType aia_type; int aia_guests; + char *oem_id; + char *oem_table_id; }; enum { |