SHA256
1
0
forked from pool/xen
OBS User unknown
2007-03-06 08:12:51 +00:00
committed by Git OBS Bridge
parent 39a4f201bc
commit 759005f5a4
19 changed files with 1934 additions and 181 deletions

View File

@@ -1,7 +1,7 @@
Index: 2007-01-31/xen/arch/x86/physdev.c
Index: 2007-02-20/xen/arch/x86/physdev.c
===================================================================
--- 2007-01-31.orig/xen/arch/x86/physdev.c 2007-01-31 09:29:19.000000000 +0100
+++ 2007-01-31/xen/arch/x86/physdev.c 2007-02-14 18:22:18.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/physdev.c 2007-02-20 10:41:50.000000000 +0100
+++ 2007-02-20/xen/arch/x86/physdev.c 2007-02-20 10:56:30.000000000 +0100
@@ -143,6 +143,57 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_H
break;
}
@@ -60,10 +60,10 @@ Index: 2007-01-31/xen/arch/x86/physdev.c
default:
ret = -ENOSYS;
break;
Index: 2007-01-31/xen/arch/x86/traps.c
Index: 2007-02-20/xen/arch/x86/traps.c
===================================================================
--- 2007-01-31.orig/xen/arch/x86/traps.c 2007-02-07 17:03:20.000000000 +0100
+++ 2007-01-31/xen/arch/x86/traps.c 2007-02-15 10:12:21.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/traps.c 2007-02-20 10:56:27.000000000 +0100
+++ 2007-02-20/xen/arch/x86/traps.c 2007-02-20 10:56:30.000000000 +0100
@@ -2516,6 +2516,12 @@ long do_set_trap_table(XEN_GUEST_HANDLE(
if ( cur.address == 0 )
break;
@@ -77,10 +77,10 @@ Index: 2007-01-31/xen/arch/x86/traps.c
fixup_guest_code_selector(current->domain, cur.cs);
memcpy(&dst[cur.vector], &cur, sizeof(cur));
Index: 2007-01-31/xen/arch/x86/x86_32/asm-offsets.c
Index: 2007-02-20/xen/arch/x86/x86_32/asm-offsets.c
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_32/asm-offsets.c 2006-12-13 11:15:54.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_32/asm-offsets.c 2007-02-15 09:51:44.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_32/asm-offsets.c 2006-12-13 11:15:54.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_32/asm-offsets.c 2007-02-20 10:56:30.000000000 +0100
@@ -68,6 +68,7 @@ void __dummy__(void)
OFFSET(VCPU_arch_guest_fpu_ctxt, struct vcpu, arch.guest_context.fpu_ctxt);
OFFSET(VCPU_flags, struct vcpu, vcpu_flags);
@@ -89,10 +89,10 @@ Index: 2007-01-31/xen/arch/x86/x86_32/asm-offsets.c
DEFINE(_VCPUF_nmi_pending, _VCPUF_nmi_pending);
DEFINE(_VCPUF_nmi_masked, _VCPUF_nmi_masked);
DEFINE(_VGCF_failsafe_disables_events, _VGCF_failsafe_disables_events);
Index: 2007-01-31/xen/arch/x86/x86_32/entry.S
Index: 2007-02-20/xen/arch/x86/x86_32/entry.S
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_32/entry.S 2007-01-31 09:42:04.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_32/entry.S 2007-02-15 09:54:40.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_32/entry.S 2007-02-20 10:56:03.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_32/entry.S 2007-02-20 10:56:30.000000000 +0100
@@ -232,7 +232,7 @@ test_all_events:
shl $IRQSTAT_shift,%eax
test %ecx,irq_stat(%eax,1)
@@ -128,10 +128,10 @@ Index: 2007-01-31/xen/arch/x86/x86_32/entry.S
jmp test_guest_events
bad_hypercall:
Index: 2007-01-31/xen/arch/x86/x86_64/asm-offsets.c
Index: 2007-02-20/xen/arch/x86/x86_64/asm-offsets.c
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_64/asm-offsets.c 2007-01-31 09:29:21.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_64/asm-offsets.c 2007-02-15 10:03:33.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_64/asm-offsets.c 2007-02-20 10:41:52.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_64/asm-offsets.c 2007-02-20 10:56:30.000000000 +0100
@@ -76,6 +76,7 @@ void __dummy__(void)
OFFSET(VCPU_arch_guest_fpu_ctxt, struct vcpu, arch.guest_context.fpu_ctxt);
OFFSET(VCPU_flags, struct vcpu, vcpu_flags);
@@ -140,10 +140,10 @@ Index: 2007-01-31/xen/arch/x86/x86_64/asm-offsets.c
DEFINE(_VCPUF_nmi_pending, _VCPUF_nmi_pending);
DEFINE(_VCPUF_nmi_masked, _VCPUF_nmi_masked);
DEFINE(_VGCF_failsafe_disables_events, _VGCF_failsafe_disables_events);
Index: 2007-01-31/xen/arch/x86/x86_64/compat/entry.S
Index: 2007-02-20/xen/arch/x86/x86_64/compat/entry.S
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_64/compat/entry.S 2007-01-31 09:42:04.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_64/compat/entry.S 2007-02-15 10:22:57.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_64/compat/entry.S 2007-02-20 10:56:03.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_64/compat/entry.S 2007-02-20 10:56:30.000000000 +0100
@@ -68,7 +68,7 @@ compat_test_all_events:
leaq irq_stat(%rip),%rcx
testl $~0,(%rcx,%rax,1)
@@ -198,10 +198,10 @@ Index: 2007-01-31/xen/arch/x86/x86_64/compat/entry.S
movw $TBF_FAILSAFE,TRAPBOUNCE_flags(%rdx)
btq $_VGCF_failsafe_disables_events,VCPU_guest_context_flags(%rbx)
jnc 1f
Index: 2007-01-31/xen/arch/x86/x86_64/compat/traps.c
Index: 2007-02-20/xen/arch/x86/x86_64/compat/traps.c
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_64/compat/traps.c 2007-01-31 09:29:26.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_64/compat/traps.c 2007-02-15 10:10:46.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_64/compat/traps.c 2007-02-20 10:41:57.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_64/compat/traps.c 2007-02-20 10:56:30.000000000 +0100
@@ -287,6 +287,12 @@ int compat_set_trap_table(XEN_GUEST_HAND
if ( cur.address == 0 )
break;
@@ -215,10 +215,10 @@ Index: 2007-01-31/xen/arch/x86/x86_64/compat/traps.c
fixup_guest_code_selector(current->domain, cur.cs);
XLAT_trap_info(dst + cur.vector, &cur);
Index: 2007-01-31/xen/arch/x86/x86_64/entry.S
Index: 2007-02-20/xen/arch/x86/x86_64/entry.S
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_64/entry.S 2007-01-31 09:42:04.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_64/entry.S 2007-02-14 17:15:25.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_64/entry.S 2007-02-20 10:56:03.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_64/entry.S 2007-02-20 10:56:30.000000000 +0100
@@ -177,7 +177,7 @@ test_all_events:
leaq irq_stat(%rip),%rcx
testl $~0,(%rcx,%rax,1)
@@ -246,10 +246,10 @@ Index: 2007-01-31/xen/arch/x86/x86_64/entry.S
jmp test_guest_events
bad_hypercall:
Index: 2007-01-31/xen/arch/x86/x86_64/physdev.c
Index: 2007-02-20/xen/arch/x86/x86_64/physdev.c
===================================================================
--- 2007-01-31.orig/xen/arch/x86/x86_64/physdev.c 2007-01-31 09:29:19.000000000 +0100
+++ 2007-01-31/xen/arch/x86/x86_64/physdev.c 2007-02-14 18:26:33.000000000 +0100
--- 2007-02-20.orig/xen/arch/x86/x86_64/physdev.c 2007-02-20 10:41:50.000000000 +0100
+++ 2007-02-20/xen/arch/x86/x86_64/physdev.c 2007-02-20 10:56:30.000000000 +0100
@@ -30,6 +30,10 @@
#define physdev_irq_status_query compat_physdev_irq_status_query
#define physdev_irq_status_query_t physdev_irq_status_query_compat_t
@@ -261,11 +261,11 @@ Index: 2007-01-31/xen/arch/x86/x86_64/physdev.c
#define COMPAT
#undef guest_handle_okay
#define guest_handle_okay compat_handle_okay
Index: 2007-01-31/xen/common/kernel.c
Index: 2007-02-20/xen/common/kernel.c
===================================================================
--- 2007-01-31.orig/xen/common/kernel.c 2007-01-31 09:44:25.000000000 +0100
+++ 2007-01-31/xen/common/kernel.c 2007-02-15 10:18:48.000000000 +0100
@@ -252,16 +252,20 @@ long register_guest_nmi_callback(unsigne
--- 2007-02-20.orig/xen/common/kernel.c 2007-02-20 10:41:46.000000000 +0100
+++ 2007-02-20/xen/common/kernel.c 2007-02-20 10:56:30.000000000 +0100
@@ -247,16 +247,20 @@ long register_guest_nmi_callback(unsigne
struct vcpu *v = current;
struct domain *d = current->domain;
@@ -290,7 +290,7 @@ Index: 2007-01-31/xen/common/kernel.c
set_bit(_VCPUF_nmi_pending, &v->vcpu_flags);
#endif
@@ -272,6 +276,11 @@ long unregister_guest_nmi_callback(void)
@@ -267,6 +271,11 @@ long unregister_guest_nmi_callback(void)
{
struct vcpu *v = current;
@@ -302,10 +302,10 @@ Index: 2007-01-31/xen/common/kernel.c
v->nmi_addr = 0;
return 0;
Index: 2007-01-31/xen/include/public/physdev.h
Index: 2007-02-20/xen/include/public/physdev.h
===================================================================
--- 2007-01-31.orig/xen/include/public/physdev.h 2006-12-13 11:15:56.000000000 +0100
+++ 2007-01-31/xen/include/public/physdev.h 2007-02-14 18:21:35.000000000 +0100
--- 2007-02-20.orig/xen/include/public/physdev.h 2006-12-13 11:15:56.000000000 +0100
+++ 2007-02-20/xen/include/public/physdev.h 2007-02-20 10:56:30.000000000 +0100
@@ -119,6 +119,22 @@ typedef struct physdev_irq physdev_irq_t
DEFINE_XEN_GUEST_HANDLE(physdev_irq_t);
@@ -329,10 +329,10 @@ Index: 2007-01-31/xen/include/public/physdev.h
* Argument to physdev_op_compat() hypercall. Superceded by new physdev_op()
* hypercall since 0x00030202.
*/
Index: 2007-01-31/xen/include/xen/sched.h
Index: 2007-02-20/xen/include/xen/sched.h
===================================================================
--- 2007-01-31.orig/xen/include/xen/sched.h 2007-01-31 09:39:18.000000000 +0100
+++ 2007-01-31/xen/include/xen/sched.h 2007-02-15 09:38:57.000000000 +0100
--- 2007-02-20.orig/xen/include/xen/sched.h 2007-02-20 10:42:03.000000000 +0100
+++ 2007-02-20/xen/include/xen/sched.h 2007-02-20 10:56:30.000000000 +0100
@@ -108,7 +108,11 @@ struct vcpu
/* Bitmask of CPUs on which this VCPU may run. */
cpumask_t cpu_affinity;
@@ -345,10 +345,10 @@ Index: 2007-01-31/xen/include/xen/sched.h
/* Bitmask of CPUs which are holding onto this VCPU's state. */
cpumask_t vcpu_dirty_cpumask;
Index: 2007-01-31/xen/include/xlat.lst
Index: 2007-02-20/xen/include/xlat.lst
===================================================================
--- 2007-01-31.orig/xen/include/xlat.lst 2007-01-31 09:29:27.000000000 +0100
+++ 2007-01-31/xen/include/xlat.lst 2007-02-14 17:58:42.000000000 +0100
--- 2007-02-20.orig/xen/include/xlat.lst 2007-02-20 10:41:58.000000000 +0100
+++ 2007-02-20/xen/include/xlat.lst 2007-02-20 10:56:30.000000000 +0100
@@ -40,6 +40,7 @@
! memory_map memory.h
! memory_reservation memory.h