From 99805554de5b18233522409e5575245ab21cd27a Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Tue, 15 Dec 2015 14:16:29 +0100 Subject: [PATCH] hvmloader: load proper ACPI tables with OVMF This patch loads the ACPI tables associated with QEMU instead of the one for qemu-traditional, since we only support OVMF with qemu-xen. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/ovmf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index bb3da939b8..db9fa7adb8 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -47,8 +47,8 @@ #define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 -extern unsigned char dsdt_anycpu[]; -extern int dsdt_anycpu_len; +extern unsigned char dsdt_anycpu_qemu_xen[]; +extern int dsdt_anycpu_qemu_xen_len; #define OVMF_INFO_MAX_TABLES 4 struct ovmf_info { @@ -119,8 +119,8 @@ static void ovmf_load(const struct bios_config *config) static void ovmf_acpi_build_tables(void) { struct acpi_config config = { - .dsdt_anycpu = dsdt_anycpu, - .dsdt_anycpu_len = dsdt_anycpu_len, + .dsdt_anycpu = dsdt_anycpu_qemu_xen, + .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len, .dsdt_15cpu = NULL, .dsdt_15cpu_len = 0 }; -- 2.39.5