[Xen-changelog] Undo the unintended changes to vm86.c that came in through the last merge.

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

# HG changeset patch
# User adsharma@xxxxxxxxxxxxxxxxxxxx
# Node ID cd984b3478f6403ad37ae2b72a246169de337b5c
# Parent  9c011dd3f6b7f38ba03de644018d366aa750cf4b
Undo the unintended changes to vm86.c that came in through the last merge.

diff -r 9c011dd3f6b7 -r cd984b3478f6 tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c   Mon Aug 22 18:31:19 2005
+++ b/tools/firmware/vmxassist/vm86.c   Mon Aug 22 18:37:48 2005
@@ -38,7 +38,7 @@
 enum vm86_mode mode;
 
 #ifdef DEBUG
-int traceset = 0xff;
+int traceset = 0;
 
 char *states[] = {
        "<VM86_REAL>",
@@ -446,8 +446,6 @@
 #endif
                        if (getreg(regs, modrm) & CR0_PE)
                                set_mode(regs, VM86_REAL_TO_PROTECTED);
-                        else
-                               set_mode(regs, VM86_REAL);
 
                        break;
                case 3:
@@ -605,9 +603,7 @@
 {
        switch (newmode) {
        case VM86_REAL:
-               if ((mode == VM86_PROTECTED_TO_REAL) ||
-                    (mode == VM86_REAL_TO_PROTECTED)) {
-                       regs->eflags &= ~EFLAGS_TF;
+               if (mode == VM86_PROTECTED_TO_REAL) {
                        real_mode(regs);
                        break;
                } else if (mode == VM86_REAL) {

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