From 025bec18c429d696f109c7b2799644bf708dabe6 Mon Sep 17 00:00:00 2001 From: Ross Philipson Date: Wed, 21 Jan 2009 16:09:05 -0500 Subject: [PATCH] Added OEM ID to RSDP structure for consistency. Removed uneeded includes of hvm_info_table.h. Changes to be committed: modified: tools/firmware/hvmloader/acpi/build.c modified: tools/libxc/xc_dom_x86.c modified: tools/libxc/xc_hvm_build.c --- tools/firmware/hvmloader/acpi/build.c | 3 ++- tools/libxc/xc_dom_x86.c | 1 - tools/libxc/xc_hvm_build.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 8173ee6..b21baa5 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -328,7 +328,8 @@ static void __acpi_build_tables(uint8_t *buf, int *low_sz, int *high_sz) { pt_update_acpi_tables(&Rsdt.header, va_ac); pt_update_acpi_tables(&Xsdt.header, va_ac); - /* just the OEM ID for the FADT */ + /* just the OEM ID for the RSDP and FADT */ + memcpy(Rsdp.oem_id, va_ac->oem_id, HVM_ACINFO_OEM_ID_SIZE); memcpy(Fadt.header.oem_id, va_ac->oem_id, HVM_ACINFO_OEM_ID_SIZE); } diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index f96ec3f..185ab29 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include "xg_private.h" diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c index 983bfe5..3454619 100644 --- a/tools/libxc/xc_hvm_build.c +++ b/tools/libxc/xc_hvm_build.c @@ -13,7 +13,6 @@ #include #include -#include #include #include "xc_e820.h" -- 2.39.5