diff -r b3dd6ceda9bc tools/libxc/xc_hvm_build.c --- a/tools/libxc/xc_hvm_build.c Tue Aug 08 15:43:54 2006 +0100 +++ b/tools/libxc/xc_hvm_build.c Wed Aug 09 16:04:14 2006 +0800 @@ -154,7 +154,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; @@ -173,7 +173,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); @@ -181,7 +180,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; } @@ -269,11 +267,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 b3dd6ceda9bc xen/include/public/hvm/hvm_info_table.h --- a/xen/include/public/hvm/hvm_info_table.h Tue Aug 08 15:43:54 2006 +0100 +++ b/xen/include/public/hvm/hvm_info_table.h Wed Aug 09 16:04:14 2006 +0800 @@ -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; };