1.1 --- a/tools/libxc/xc_hvm_build.c	Thu Aug 10 10:43:20 2006 +0100
     1.2 +++ b/tools/libxc/xc_hvm_build.c	Thu Aug 10 10:45:10 2006 +0100
     1.3 @@ -167,7 +167,7 @@ static void set_hvm_info_checksum(struct
     1.4   */
     1.5  static int set_hvm_info(int xc_handle, uint32_t dom,
     1.6                          xen_pfn_t *pfn_list, unsigned int vcpus,
     1.7 -                        unsigned int pae, unsigned int acpi, unsigned int apic)
     1.8 +                        unsigned int acpi, unsigned int apic)
     1.9  {
    1.10      char *va_map;
    1.11      struct hvm_info_table *va_hvm;
    1.12 @@ -186,7 +186,6 @@ static int set_hvm_info(int xc_handle, u
    1.13      va_hvm->length       = sizeof(struct hvm_info_table);
    1.14      va_hvm->acpi_enabled = acpi;
    1.15      va_hvm->apic_enabled = apic;
    1.16 -    va_hvm->pae_enabled  = pae;
    1.17      va_hvm->nr_vcpus     = vcpus;
    1.18  
    1.19      set_hvm_info_checksum(va_hvm);
    1.20 @@ -194,7 +193,6 @@ static int set_hvm_info(int xc_handle, u
    1.21      munmap(va_map, PAGE_SIZE);
    1.22  
    1.23      xc_set_hvm_param(xc_handle, dom, HVM_PARAM_APIC_ENABLED, apic);
    1.24 -    xc_set_hvm_param(xc_handle, dom, HVM_PARAM_PAE_ENABLED, pae);
    1.25  
    1.26      return 0;
    1.27  }
    1.28 @@ -285,12 +283,14 @@ static int setup_guest(int xc_handle,
    1.29              goto error_out;
    1.30      }
    1.31  
    1.32 -    if ( set_hvm_info(xc_handle, dom, page_array, vcpus, pae, acpi, apic) )
    1.33 +    if ( set_hvm_info(xc_handle, dom, page_array, vcpus, acpi, apic) )
    1.34      {
    1.35          ERROR("Couldn't set hvm info for HVM guest.\n");
    1.36          goto error_out;
    1.37      }
    1.38  
    1.39 +    xc_set_hvm_param(xc_handle, dom, HVM_PARAM_PAE_ENABLED, pae);
    1.40 +
    1.41      if ( (e820_page = xc_map_foreign_range(
    1.42                xc_handle, dom, PAGE_SIZE, PROT_READ | PROT_WRITE,
    1.43                page_array[E820_MAP_PAGE >> PAGE_SHIFT])) == 0 )

     2.1 --- a/xen/include/public/hvm/hvm_info_table.h	Thu Aug 10 10:43:20 2006 +0100
     2.2 +++ b/xen/include/public/hvm/hvm_info_table.h	Thu Aug 10 10:45:10 2006 +0100
     2.3 @@ -17,7 +17,6 @@ struct hvm_info_table {
     2.4      uint8_t     checksum;
     2.5      uint8_t     acpi_enabled;
     2.6      uint8_t     apic_enabled;
     2.7 -    uint8_t     pae_enabled;
     2.8      uint32_t    nr_vcpus;
     2.9  };
    2.10