ia64/xen-unstable

changeset 6546:cd984b3478f6

Undo the unintended changes to vm86.c that came in through the last merge.
author adsharma@los-vmm.sc.intel.com
date Mon Aug 22 11:37:48 2005 -0700 (2005-08-22)
parents 9c011dd3f6b7
children cc5f88b719d0
files tools/firmware/vmxassist/vm86.c
line diff
     1.1 --- a/tools/firmware/vmxassist/vm86.c	Mon Aug 22 11:31:19 2005 -0700
     1.2 +++ b/tools/firmware/vmxassist/vm86.c	Mon Aug 22 11:37:48 2005 -0700
     1.3 @@ -38,7 +38,7 @@ unsigned prev_eip = 0;
     1.4  enum vm86_mode mode;
     1.5  
     1.6  #ifdef DEBUG
     1.7 -int traceset = 0xff;
     1.8 +int traceset = 0;
     1.9  
    1.10  char *states[] = {
    1.11  	"<VM86_REAL>",
    1.12 @@ -446,8 +446,6 @@ movcr(struct regs *regs, unsigned prefix
    1.13  #endif
    1.14  			if (getreg(regs, modrm) & CR0_PE)
    1.15  				set_mode(regs, VM86_REAL_TO_PROTECTED);
    1.16 -                        else
    1.17 -				set_mode(regs, VM86_REAL);
    1.18  
    1.19  			break;
    1.20  		case 3:
    1.21 @@ -605,9 +603,7 @@ set_mode(struct regs *regs, enum vm86_mo
    1.22  {
    1.23  	switch (newmode) {
    1.24  	case VM86_REAL:
    1.25 -		if ((mode == VM86_PROTECTED_TO_REAL) ||
    1.26 -                    (mode == VM86_REAL_TO_PROTECTED)) {
    1.27 -			regs->eflags &= ~EFLAGS_TF;
    1.28 +		if (mode == VM86_PROTECTED_TO_REAL) {
    1.29  			real_mode(regs);
    1.30  			break;
    1.31  		} else if (mode == VM86_REAL) {