mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Undo the unintended changes to vm86.c that came in through the last merge.
This commit is contained in:
adsharma@los-vmm.sc.intel.com committed
1 parent
a81cd35554
commit
543079029c
1 file changed
+2
-6
@@ -38,7 +38,7 @@ unsigned prev_eip = 0;
|
||||
enum vm86_mode mode;
|
||||
|
||||
#ifdef DEBUG
|
||||
int traceset = 0xff;
|
||||
int traceset = 0;
|
||||
|
||||
char *states[] = {
|
||||
"<VM86_REAL>",
|
||||
@@ -446,8 +446,6 @@ movcr(struct regs *regs, unsigned prefix, unsigned opc)
|
||||
#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 @@ set_mode(struct regs *regs, enum vm86_mode newmode)
|
||||
{
|
||||
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) {
|
||||
|
||||