[Xen-changelog] [xen-unstable] [VMXASSIST] Fix the wrong order definition of ES/DS in regs structure.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID f3ee62b7fb5299c89d442845e0883bcfab78c067
# Parent  84c0f49de1b1e241a4b409a48192c110b01788a0
[VMXASSIST] Fix the wrong order definition of ES/DS in regs structure.
Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx>
---
 tools/firmware/vmxassist/util.c |   13 +++++++------
 tools/firmware/vmxassist/vm86.h |   10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff -r 84c0f49de1b1 -r f3ee62b7fb52 tools/firmware/vmxassist/util.c
--- a/tools/firmware/vmxassist/util.c   Mon Nov 27 10:06:41 2006 +0000
+++ b/tools/firmware/vmxassist/util.c   Mon Nov 27 10:08:12 2006 +0000
@@ -62,14 +62,15 @@ dump_regs(struct regs *regs)
                regs->eax, regs->ecx, regs->edx, regs->ebx);
        printf("esp    %8x ebp    %8x esi    %8x edi    %8x\n",
                regs->esp, regs->ebp, regs->esi, regs->edi);
-       printf("eip    %8x eflags %8x cs     %8x ds     %8x\n",
-               regs->eip, regs->eflags, regs->cs, regs->ds);
-       printf("es     %8x fs     %8x uss    %8x uesp   %8x\n",
-               regs->es, regs->fs, regs->uss, regs->uesp);
+       printf("es     %8x ds     %8x fs     %8x gs     %8x\n",
+               regs->es, regs->ds, regs->fs, regs->gs);
+       printf("trapno %8x errno  %8x\n", regs->trapno, regs->errno);
+       printf("eip    %8x cs     %8x eflags %8x\n",
+               regs->eip, regs->cs, regs->eflags);
+       printf("uesp   %8x uss    %8x \n",
+               regs->uesp, regs->uss);
        printf("ves    %8x vds    %8x vfs    %8x vgs    %8x\n",
                regs->ves, regs->vds, regs->vfs, regs->vgs);
-       if (regs->trapno != -1 || regs->errno != -1)
-               printf("trapno %8x errno  %8x\n", regs->trapno, regs->errno);
 
        printf("cr0    %8lx cr2    %8x cr3    %8lx cr4    %8lx\n",
                (long)oldctx.cr0, get_cr2(),
diff -r 84c0f49de1b1 -r f3ee62b7fb52 tools/firmware/vmxassist/vm86.h
--- a/tools/firmware/vmxassist/vm86.h   Mon Nov 27 10:06:41 2006 +0000
+++ b/tools/firmware/vmxassist/vm86.h   Mon Nov 27 10:08:12 2006 +0000
@@ -33,11 +33,11 @@
 #ifndef __ASSEMBLY__
 
 struct regs {
-        unsigned       edi, esi, ebp, esp, ebx, edx, ecx, eax;
-        unsigned       ds, es, fs, gs;
-        unsigned       trapno, errno;
-        unsigned       eip, cs, eflags, uesp, uss;
-        unsigned       ves, vds, vfs, vgs;
+       unsigned        edi, esi, ebp, esp, ebx, edx, ecx, eax;
+       unsigned        es, ds, fs, gs;
+       unsigned        trapno, errno;
+       unsigned        eip, cs, eflags, uesp, uss;
+       unsigned        ves, vds, vfs, vgs;
 };
 
 enum vm86_mode {

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