# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 713b0878da2f863d449a7b4628403f3dd82fa56f
# Parent ec49795871564176cb161d00106da6711a5c5074
[HVM] Rmove unused field pae_enabled from hvm_info_table.
Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx>
---
tools/libxc/xc_hvm_build.c | 8 ++++----
xen/include/public/hvm/hvm_info_table.h | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff -r ec4979587156 -r 713b0878da2f tools/libxc/xc_hvm_build.c
--- a/tools/libxc/xc_hvm_build.c Thu Aug 10 10:43:20 2006 +0100
+++ b/tools/libxc/xc_hvm_build.c Thu Aug 10 10:45:10 2006 +0100
@@ -167,7 +167,7 @@ static void set_hvm_info_checksum(struct
*/
static int set_hvm_info(int xc_handle, uint32_t dom,
xen_pfn_t *pfn_list, unsigned int vcpus,
- unsigned int pae, unsigned int acpi, unsigned int apic)
+ unsigned int acpi, unsigned int apic)
{
char *va_map;
struct hvm_info_table *va_hvm;
@@ -186,7 +186,6 @@ static int set_hvm_info(int xc_handle, u
va_hvm->length = sizeof(struct hvm_info_table);
va_hvm->acpi_enabled = acpi;
va_hvm->apic_enabled = apic;
- va_hvm->pae_enabled = pae;
va_hvm->nr_vcpus = vcpus;
set_hvm_info_checksum(va_hvm);
@@ -194,7 +193,6 @@ static int set_hvm_info(int xc_handle, u
munmap(va_map, PAGE_SIZE);
xc_set_hvm_param(xc_handle, dom, HVM_PARAM_APIC_ENABLED, apic);
- xc_set_hvm_param(xc_handle, dom, HVM_PARAM_PAE_ENABLED, pae);
return 0;
}
@@ -285,11 +283,13 @@ static int setup_guest(int xc_handle,
goto error_out;
}
- if ( set_hvm_info(xc_handle, dom, page_array, vcpus, pae, acpi, apic) )
+ if ( set_hvm_info(xc_handle, dom, page_array, vcpus, acpi, apic) )
{
ERROR("Couldn't set hvm info for HVM guest.\n");
goto error_out;
}
+
+ xc_set_hvm_param(xc_handle, dom, HVM_PARAM_PAE_ENABLED, pae);
if ( (e820_page = xc_map_foreign_range(
xc_handle, dom, PAGE_SIZE, PROT_READ | PROT_WRITE,
diff -r ec4979587156 -r 713b0878da2f xen/include/public/hvm/hvm_info_table.h
--- a/xen/include/public/hvm/hvm_info_table.h Thu Aug 10 10:43:20 2006 +0100
+++ b/xen/include/public/hvm/hvm_info_table.h Thu Aug 10 10:45:10 2006 +0100
@@ -17,7 +17,6 @@ struct hvm_info_table {
uint8_t checksum;
uint8_t acpi_enabled;
uint8_t apic_enabled;
- uint8_t pae_enabled;
uint32_t nr_vcpus;
};
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home