From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Luv8R-00046s-Tq for qemu-devel@nongnu.org; Fri, 17 Apr 2009 16:58:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Luv8H-0003ym-Gw for qemu-devel@nongnu.org; Fri, 17 Apr 2009 16:58:01 -0400 Received: from [199.232.76.173] (port=42731 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Luv8H-0003yM-7X for qemu-devel@nongnu.org; Fri, 17 Apr 2009 16:57:57 -0400 Received: from mx2.redhat.com ([66.187.237.31]:52289) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Luv8E-0008Gx-2j for qemu-devel@nongnu.org; Fri, 17 Apr 2009 16:57:56 -0400 From: Glauber Costa Date: Fri, 17 Apr 2009 16:57:40 -0400 Message-Id: <1240001860-2280-3-git-send-email-glommer@redhat.com> In-Reply-To: <1240001860-2280-2-git-send-email-glommer@redhat.com> References: <1240001860-2280-1-git-send-email-glommer@redhat.com> <1240001860-2280-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] kvm: bios: remove acpi_build_processor_ssdt Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: bochs-developers@lists.sourceforge.net Cc: aliguori@us.ibm.com, Avi Kivity , qemu-devel@nongnu.org, Glauber Costa From: Glauber Costa It is now present in the dsdt, provided by acpi-dst.dsl, so having it in here confuses things. Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity --- 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