From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvvOz-0004la-11 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 11:59:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvvOs-0004bS-QT for qemu-devel@nongnu.org; Thu, 08 Oct 2009 11:59:34 -0400 Received: from [199.232.76.173] (port=57558 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvvOs-0004aw-II for qemu-devel@nongnu.org; Thu, 08 Oct 2009 11:59:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62741) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvvOr-0002JK-Od for qemu-devel@nongnu.org; Thu, 08 Oct 2009 11:59:30 -0400 From: Gleb Natapov Date: Thu, 8 Oct 2009 17:59:06 +0200 Message-Id: <1255017566-26220-2-git-send-email-gleb@redhat.com> In-Reply-To: <1255017566-26220-1-git-send-email-gleb@redhat.com> References: <1255017566-26220-1-git-send-email-gleb@redhat.com> Subject: [Qemu-devel] [PATCH v2 01/21] Add support for passing additional acpi tables from qemu. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kevin@koconnor.net Cc: qemu-devel@nongnu.org Signed-off-by: Gleb Natapov --- v1->v2 - drop CONFIG_KVM change. That was unintentional src/acpi.c | 18 +++++++++++++++++- src/paravirt.c | 27 +++++++++++++++++++++++++++ src/paravirt.h | 3 +++ 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index b9d449f..dafd8c8 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -11,7 +11,7 @@ #include "biosvar.h" // GET_EBDA #include "pci_ids.h" // PCI_VENDOR_ID_INTEL #include "pci_regs.h" // PCI_INTERRUPT_LINE - +#include "paravirt.h" /****************************************************/ /* ACPI tables init */ @@ -444,6 +444,22 @@ acpi_bios_init(void) ACPI_INIT_TABLE(build_ssdt()); ACPI_INIT_TABLE(build_madt()); + u16 i, external_tables = qemu_cfg_acpi_additional_tables(); + + for(i = 0; i < external_tables; i++) { + u16 len = qemu_cfg_next_acpi_table_len(); + void *addr = malloc_high(len); + if (!addr) { + dprintf(1, "Not enogh memory of ext acpi table of size %d!\n", len); + continue; + } + ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len)); + if (tbl_idx == MAX_ACPI_TABLES) { + dprintf(1, "To many external table!\n"); + break; + } + } + struct rsdt_descriptor_rev1 *rsdt; size_t rsdt_len = sizeof(*rsdt) + sizeof(u32) * tbl_idx; rsdt = malloc_high(rsdt_len); diff --git a/src/paravirt.c b/src/paravirt.c index 56d8421..cd1f263 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -72,3 +72,30 @@ int qemu_cfg_show_boot_menu(void) return v; } +u16 qemu_cfg_acpi_additional_tables(void) +{ + u16 cnt; + + if (!qemu_cfg_present) + return 0; + + qemu_cfg_read_entry(&cnt, QEMU_CFG_ACPI_TABLES, sizeof(cnt)); + + return cnt; +} + +u16 qemu_cfg_next_acpi_table_len(void) +{ + u16 len; + + qemu_cfg_read((u8*)&len, sizeof(len)); + + return len; +} + +void* qemu_cfg_next_acpi_table_load(void *addr, u16 len) +{ + qemu_cfg_read(addr, len); + return addr; +} + diff --git a/src/paravirt.h b/src/paravirt.h index 6997cff..c2bab71 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -40,5 +40,8 @@ extern int qemu_cfg_present; void qemu_cfg_port_probe(void); int qemu_cfg_show_boot_menu(void); void qemu_cfg_get_uuid(u8 *uuid); +u16 qemu_cfg_acpi_additional_tables(void); +u16 qemu_cfg_next_acpi_table_len(void); +void *qemu_cfg_next_acpi_table_load(void *addr, u16 len); #endif -- 1.6.3.3