From: Ross Philipson <ross.philipson@citrix.com>
Date: Wed, 21 Jan 2009 21:09:05 +0000 (-0500)
Subject: Added OEM ID to RSDP structure for consistency. Removed uneeded includes
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=025bec18c429d696f109c7b2799644bf708dabe6;p=xenclient%2Fxen.git

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
---

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 <xen/xen.h>
 #include <xen/foreign/x86_32.h>
 #include <xen/foreign/x86_64.h>
-#include <xen/hvm/hvm_info_table.h>
 #include <xen/io/protocols.h>
 
 #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 <xen/foreign/x86_32.h>
 #include <xen/foreign/x86_64.h>
-#include <xen/hvm/hvm_info_table.h>
 #include <xen/hvm/params.h>
 #include "xc_e820.h"