1.1 --- a/tools/firmware/hvmloader/hvmloader.c	Thu Aug 10 14:29:04 2006 +0100
     1.2 +++ b/tools/firmware/hvmloader/hvmloader.c	Thu Aug 10 15:45:47 2006 +0100
     1.3 @@ -26,7 +26,7 @@
     1.4  #include "hypercall.h"
     1.5  #include "util.h"
     1.6  #include <xen/version.h>
     1.7 -#include <xen/hvm/hvm_info_table.h>
     1.8 +#include <xen/hvm/params.h>
     1.9  
    1.10  /* memory map */
    1.11  #define HYPERCALL_PHYSICAL_ADDRESS	0x00080000
    1.12 @@ -172,7 +172,7 @@ init_hypercalls(void)
    1.13  int
    1.14  main(void)
    1.15  {
    1.16 -	struct hvm_info_table *t = get_hvm_info_table();
    1.17 +	struct xen_hvm_param hvm_param;
    1.18  
    1.19  	puts("HVM Loader\n");
    1.20  
    1.21 @@ -180,7 +180,10 @@ main(void)
    1.22  
    1.23  	puts("Loading ROMBIOS ...\n");
    1.24  	memcpy((void *)ROMBIOS_PHYSICAL_ADDRESS, rombios, sizeof(rombios));
    1.25 -	if (t->apic_enabled)
    1.26 +
    1.27 +	hvm_param.domid = DOMID_SELF;
    1.28 +	hvm_param.index = HVM_PARAM_APIC_ENABLED;
    1.29 +	if (!hypercall_hvm_op(HVMOP_get_param, &hvm_param) && hvm_param.value)
    1.30  		create_mp_tables();
    1.31  	
    1.32  	if (cirrus_check()) {

     2.1 --- a/tools/libxc/xc_hvm_build.c	Thu Aug 10 14:29:04 2006 +0100
     2.2 +++ b/tools/libxc/xc_hvm_build.c	Thu Aug 10 15:45:47 2006 +0100
     2.3 @@ -185,7 +185,6 @@ static int set_hvm_info(int xc_handle, u
     2.4      strncpy(va_hvm->signature, "HVM INFO", 8);
     2.5      va_hvm->length       = sizeof(struct hvm_info_table);
     2.6      va_hvm->acpi_enabled = acpi;
     2.7 -    va_hvm->apic_enabled = apic;
     2.8      va_hvm->nr_vcpus     = vcpus;
     2.9  
    2.10      set_hvm_info_checksum(va_hvm);

     3.1 --- a/xen/arch/x86/hvm/hvm.c	Thu Aug 10 14:29:04 2006 +0100
     3.2 +++ b/xen/arch/x86/hvm/hvm.c	Thu Aug 10 15:45:47 2006 +0100
     3.3 @@ -47,7 +47,6 @@
     3.4  #endif
     3.5  #include <public/sched.h>
     3.6  #include <public/hvm/ioreq.h>
     3.7 -#include <public/hvm/hvm_info_table.h>
     3.8  #include <public/version.h>
     3.9  #include <public/memory.h>
    3.10  

     4.1 --- a/xen/include/public/hvm/hvm_info_table.h	Thu Aug 10 14:29:04 2006 +0100
     4.2 +++ b/xen/include/public/hvm/hvm_info_table.h	Thu Aug 10 15:45:47 2006 +0100
     4.3 @@ -16,7 +16,6 @@ struct hvm_info_table {
     4.4      uint32_t    length;
     4.5      uint8_t     checksum;
     4.6      uint8_t     acpi_enabled;
     4.7 -    uint8_t     apic_enabled;
     4.8      uint32_t    nr_vcpus;
     4.9  };
    4.10