# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1177581109 -3600
# Node ID fb5d1c6cfddc78b9d4d9e4fa7446a36768e2c35c
# Parent d26bdda2854ea82adb46f2ea7e1943a53ed28479
xen x86/64 compat: Fix size of accesses to trap_bounce.cs in asm.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/x86_64/compat/entry.S | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -r d26bdda2854e -r fb5d1c6cfddc xen/arch/x86/x86_64/compat/entry.S
--- a/xen/arch/x86/x86_64/compat/entry.S Thu Apr 26 09:52:34 2007 +0100
+++ b/xen/arch/x86/x86_64/compat/entry.S Thu Apr 26 10:51:49 2007 +0100
@@ -101,7 +101,7 @@ compat_test_guest_events:
movl VCPU_event_addr(%rbx),%eax
movl %eax,TRAPBOUNCE_eip(%rdx)
movl VCPU_event_sel(%rbx),%eax
- movl %eax,TRAPBOUNCE_cs(%rdx)
+ movw %ax,TRAPBOUNCE_cs(%rdx)
movb $TBF_INTERRUPT,TRAPBOUNCE_flags(%rdx)
call compat_create_bounce_frame
jmp compat_test_all_events
@@ -126,7 +126,7 @@ compat_process_nmi:
sti
leaq VCPU_trap_bounce(%rbx),%rdx
movl %eax,TRAPBOUNCE_eip(%rdx)
- movl $FLAT_COMPAT_KERNEL_CS,TRAPBOUNCE_cs(%rdx)
+ movw $FLAT_COMPAT_KERNEL_CS,TRAPBOUNCE_cs(%rdx)
movb $TBF_INTERRUPT,TRAPBOUNCE_flags(%rdx)
call compat_create_bounce_frame
jmp compat_test_all_events
@@ -164,7 +164,7 @@ compat_failsafe_callback:
movl VCPU_failsafe_addr(%rbx),%eax
movl %eax,TRAPBOUNCE_eip(%rdx)
movl VCPU_failsafe_sel(%rbx),%eax
- movl %eax,TRAPBOUNCE_cs(%rdx)
+ movw %ax,TRAPBOUNCE_cs(%rdx)
movb $TBF_FAILSAFE,TRAPBOUNCE_flags(%rdx)
btq $_VGCF_failsafe_disables_events,VCPU_guest_context_flags(%rbx)
jnc 1f
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|