[Xen-changelog] [xen-unstable] x86: Change proliant io emulation stub to use pushf/popf instead of pushfw/popfw.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1197047115 0
# Node ID 35890b2609716f8474cd4085582abed605975cce
# Parent  a74efcdc87b34904c6ab02b74ae3c981427fa9f9
x86: Change proliant io emulation stub to use pushf/popf instead of 
pushfw/popfw.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/ioport_emulate.c |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff -r a74efcdc87b3 -r 35890b260971 xen/arch/x86/ioport_emulate.c
--- a/xen/arch/x86/ioport_emulate.c     Fri Dec 07 16:39:15 2007 +0000
+++ b/xen/arch/x86/ioport_emulate.c     Fri Dec 07 17:05:15 2007 +0000
@@ -22,26 +22,24 @@ static void ioemul_handle_proliant_quirk
     if ( (opcode != 0xee) || (port != 0xcd4) || !(value & 0x80) )
         return;
 
-    /*    pushfw */
-    io_emul_stub[ 0] = 0x66;
-    io_emul_stub[ 1] = 0x9c;
+    /*    pushf */
+    io_emul_stub[0] = 0x9c;
     /*    cli */
-    io_emul_stub[ 2] = 0xfa;
+    io_emul_stub[1] = 0xfa;
     /*    out %al,%dx */
-    io_emul_stub[ 3] = 0xee;
+    io_emul_stub[2] = 0xee;
     /* 1: in %dx,%al */
-    io_emul_stub[ 4] = 0xec;
+    io_emul_stub[3] = 0xec;
     /*    test $0x80,%al */
-    io_emul_stub[ 5] = 0xa8;
-    io_emul_stub[ 6] = 0x80;
+    io_emul_stub[4] = 0xa8;
+    io_emul_stub[5] = 0x80;
     /*    jnz 1b */
-    io_emul_stub[ 7] = 0x75;
-    io_emul_stub[ 8] = 0xfb;
-    /*    popfw */
-    io_emul_stub[ 9] = 0x66;
-    io_emul_stub[10] = 0x9d;
+    io_emul_stub[6] = 0x75;
+    io_emul_stub[7] = 0xfb;
+    /*    popf */
+    io_emul_stub[8] = 0x9d;
     /*    ret */
-    io_emul_stub[11] = 0xc3;
+    io_emul_stub[9] = 0xc3;
 }
 
 int __init proliant_quirk(struct dmi_system_id *d)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog