2008-03-14 23:07:14 +00:00
|
|
|
Index: xen-3.2.1-testing/xen/arch/x86/traps.c
|
2008-01-12 01:32:53 +00:00
|
|
|
===================================================================
|
2008-03-14 23:07:14 +00:00
|
|
|
--- xen-3.2.1-testing.orig/xen/arch/x86/traps.c
|
|
|
|
|
+++ xen-3.2.1-testing/xen/arch/x86/traps.c
|
2008-01-12 01:32:53 +00:00
|
|
|
@@ -49,6 +49,7 @@
|
|
|
|
|
#include <xen/trace.h>
|
|
|
|
|
#include <asm/paging.h>
|
|
|
|
|
#include <asm/system.h>
|
|
|
|
|
+#include <asm/hypercall.h>
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
|
#include <asm/atomic.h>
|
|
|
|
|
#include <asm/desc.h>
|
2008-04-12 19:41:18 +00:00
|
|
|
@@ -2884,7 +2885,7 @@ long unregister_guest_nmi_callback(void)
|
2008-01-12 01:32:53 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-long do_set_trap_table(XEN_GUEST_HANDLE(trap_info_t) traps)
|
|
|
|
|
+long do_set_trap_table(XEN_GUEST_HANDLE(const_trap_info_t) traps)
|
|
|
|
|
{
|
|
|
|
|
struct trap_info cur;
|
|
|
|
|
struct vcpu *curr = current;
|
2008-03-14 23:07:14 +00:00
|
|
|
Index: xen-3.2.1-testing/xen/include/asm-x86/hypercall.h
|
2008-01-12 01:32:53 +00:00
|
|
|
===================================================================
|
2008-03-14 23:07:14 +00:00
|
|
|
--- xen-3.2.1-testing.orig/xen/include/asm-x86/hypercall.h
|
|
|
|
|
+++ xen-3.2.1-testing/xen/include/asm-x86/hypercall.h
|
2008-01-12 01:32:53 +00:00
|
|
|
@@ -32,9 +32,10 @@ extern long
|
|
|
|
|
do_physdev_op_compat(
|
|
|
|
|
XEN_GUEST_HANDLE(physdev_op_t) uop);
|
|
|
|
|
|
|
|
|
|
+__DEFINE_XEN_GUEST_HANDLE(const_trap_info_t, const trap_info_t);
|
|
|
|
|
extern long
|
|
|
|
|
do_set_trap_table(
|
|
|
|
|
- XEN_GUEST_HANDLE(trap_info_t) traps);
|
|
|
|
|
+ XEN_GUEST_HANDLE(const_trap_info_t) traps);
|
|
|
|
|
|
|
|
|
|
extern int
|
|
|
|
|
do_mmu_update(
|
2008-03-14 23:07:14 +00:00
|
|
|
Index: xen-3.2.1-testing/xen/include/public/arch-x86/xen.h
|
2008-01-12 01:32:53 +00:00
|
|
|
===================================================================
|
2008-03-14 23:07:14 +00:00
|
|
|
--- xen-3.2.1-testing.orig/xen/include/public/arch-x86/xen.h
|
|
|
|
|
+++ xen-3.2.1-testing/xen/include/public/arch-x86/xen.h
|
2008-04-12 19:41:18 +00:00
|
|
|
@@ -100,7 +100,6 @@ struct trap_info {
|
2008-01-12 01:32:53 +00:00
|
|
|
unsigned long address; /* code offset */
|
|
|
|
|
};
|
|
|
|
|
typedef struct trap_info trap_info_t;
|
|
|
|
|
-DEFINE_XEN_GUEST_HANDLE(trap_info_t);
|
|
|
|
|
|
|
|
|
|
typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */
|
|
|
|
|
|
