[Qemu-devel] [PATCH 2/2] kvm: bios: remove acpi_build_processor_ssdt

[Glauber Costa <glommer@redhat.com>]

From: Glauber Costa <gcosta@redhat.com>

It is now present in the dsdt, provided by acpi-dst.dsl, so having it
in here confuses things.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
 bios/rombios32.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bios/rombios32.c b/bios/rombios32.c
index 3c7757b..cf6610d 100644
--- a/bios/rombios32.c
+++ b/bios/rombios32.c
@@ -1251,9 +1251,9 @@ struct rsdt_descriptor_rev1
 {
 	ACPI_TABLE_HEADER_DEF                           /* ACPI common table header */
 #ifdef BX_QEMU
-	uint32_t                             table_offset_entry [4]; /* Array of pointers to other */
-#else
 	uint32_t                             table_offset_entry [3]; /* Array of pointers to other */
+#else
+	uint32_t                             table_offset_entry [2]; /* Array of pointers to other */
 #endif
 			 /* ACPI tables */
 } __attribute__((__packed__));
@@ -1494,12 +1494,12 @@ void acpi_bios_init(void)
     struct fadt_descriptor_rev1 *fadt;
     struct facs_descriptor_rev1 *facs;
     struct multiple_apic_table *madt;
-    uint8_t *dsdt, *ssdt;
+    uint8_t *dsdt;
 #ifdef BX_QEMU
     struct acpi_20_hpet *hpet;
     uint32_t hpet_addr;
 #endif
-    uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr, ssdt_addr;
+    uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr;
     uint32_t acpi_tables_size, madt_addr, madt_size;
     int i;
 
@@ -1573,9 +1573,8 @@ void acpi_bios_init(void)
     memset(rsdt, 0, sizeof(*rsdt));
     rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr);
     rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr);
-    rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr);
 #ifdef BX_QEMU
-    rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr);
+    rsdt->table_offset_entry[2] = cpu_to_le32(hpet_addr);
 #endif
     acpi_build_table_header((struct acpi_table_header *)rsdt,
                             "RSDT", sizeof(*rsdt), 1);
-- 
1.5.6.6