# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 323eb29083e6d596800875cafe6f843b5627d77b
# Parent 8cca42e2610a10c2eac5c45eb749cb654f2990c0
[HVM] Remove unused apic_enabled field from hvm_info_table.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/firmware/hvmloader/hvmloader.c | 9 ++++++---
tools/libxc/xc_hvm_build.c | 1 -
xen/arch/x86/hvm/hvm.c | 1 -
xen/include/public/hvm/hvm_info_table.h | 1 -
4 files changed, 6 insertions(+), 6 deletions(-)
diff -r 8cca42e2610a -r 323eb29083e6 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c Thu Aug 10 14:29:04 2006 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c Thu Aug 10 15:45:47 2006 +0100
@@ -26,7 +26,7 @@
#include "hypercall.h"
#include "util.h"
#include <xen/version.h>
-#include <xen/hvm/hvm_info_table.h>
+#include <xen/hvm/params.h>
/* memory map */
#define HYPERCALL_PHYSICAL_ADDRESS 0x00080000
@@ -172,7 +172,7 @@ int
int
main(void)
{
- struct hvm_info_table *t = get_hvm_info_table();
+ struct xen_hvm_param hvm_param;
puts("HVM Loader\n");
@@ -180,7 +180,10 @@ main(void)
puts("Loading ROMBIOS ...\n");
memcpy((void *)ROMBIOS_PHYSICAL_ADDRESS, rombios, sizeof(rombios));
- if (t->apic_enabled)
+
+ hvm_param.domid = DOMID_SELF;
+ hvm_param.index = HVM_PARAM_APIC_ENABLED;
+ if (!hypercall_hvm_op(HVMOP_get_param, &hvm_param) && hvm_param.value)
create_mp_tables();
if (cirrus_check()) {
diff -r 8cca42e2610a -r 323eb29083e6 tools/libxc/xc_hvm_build.c
--- a/tools/libxc/xc_hvm_build.c Thu Aug 10 14:29:04 2006 +0100
+++ b/tools/libxc/xc_hvm_build.c Thu Aug 10 15:45:47 2006 +0100
@@ -185,7 +185,6 @@ static int set_hvm_info(int xc_handle, u
strncpy(va_hvm->signature, "HVM INFO", 8);
va_hvm->length = sizeof(struct hvm_info_table);
va_hvm->acpi_enabled = acpi;
- va_hvm->apic_enabled = apic;
va_hvm->nr_vcpus = vcpus;
set_hvm_info_checksum(va_hvm);
diff -r 8cca42e2610a -r 323eb29083e6 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c Thu Aug 10 14:29:04 2006 +0100
+++ b/xen/arch/x86/hvm/hvm.c Thu Aug 10 15:45:47 2006 +0100
@@ -47,7 +47,6 @@
#endif
#include <public/sched.h>
#include <public/hvm/ioreq.h>
-#include <public/hvm/hvm_info_table.h>
#include <public/version.h>
#include <public/memory.h>
diff -r 8cca42e2610a -r 323eb29083e6 xen/include/public/hvm/hvm_info_table.h
--- a/xen/include/public/hvm/hvm_info_table.h Thu Aug 10 14:29:04 2006 +0100
+++ b/xen/include/public/hvm/hvm_info_table.h Thu Aug 10 15:45:47 2006 +0100
@@ -16,7 +16,6 @@ struct hvm_info_table {
uint32_t length;
uint8_t checksum;
uint8_t acpi_enabled;
- uint8_t apic_enabled;
uint32_t nr_vcpus;
};
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home