Revert "check if UG support from haxm"

This reverts commit ce2cc5b7126ed0313a3b131375296cdc95763895.

By Ritu's request.

Change-Id: I0c4584f46d747a5f2df83668bfc8795ceeb76849

diff --git a/target-i386/hax-all.c b/target-i386/hax-all.c
index 388e99d..9b9449f 100644 (file)
--- a/target-i386/hax-all.c
+++ b/target-i386/hax-all.c
@@ -44,8 +44,6 @@ static int hax_disabled = 1;
 
 int hax_support = -1;
 
-int ug_support = 0;
-
 /* Called after hax_init */
 int hax_enabled(void)
 {
@@ -170,9 +168,6 @@ static int hax_get_capability(struct hax_state *hax)
         return -ENXIO;
     }
 
-    if (cap->winfo & HAX_CAP_UG)
-       ug_support = 1;
-
     if (cap->wstatus & HAX_CAP_MEMQUOTA)
     {
         if (cap->mem_quota < hax->mem_quota)
@@ -649,12 +644,13 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
     struct hax_vcpu_state *vcpu = cpu->hax_vcpu;
     struct hax_tunnel *ht = vcpu->tunnel;
 
-    if (!ug_support && hax_vcpu_emulation_mode(env))
+    if (hax_vcpu_emulation_mode(env))
     {
         dprint("Trying to vcpu execute at eip:%lx\n", env->eip);
         return  HAX_EMUL_EXITLOOP;
     }
 
+    
     //hax_cpu_synchronize_state(env);
 
     do {
@@ -788,7 +784,7 @@ int hax_vcpu_exec(CPUArchState *env)
     struct hax_vcpu_state *vcpu;
     CPUState *cpu = ENV_GET_CPU(env);
 
-    if (!ug_support && cpu->hax_vcpu->emulation_state != HAX_EMULATE_STATE_NONE)
+    if (cpu->hax_vcpu->emulation_state != HAX_EMULATE_STATE_NONE)
         return 1;
 
     vcpu = cpu->hax_vcpu;

diff --git a/target-i386/hax-interface.h b/target-i386/hax-interface.h
index dd49683..ca0f958 100644 (file)
--- a/target-i386/hax-interface.h
+++ b/target-i386/hax-interface.h
@@ -328,7 +328,6 @@ struct hax_set_ram_info
 #define HAX_CAP_FAILREASON_NX   0x2
 
 #define HAX_CAP_MEMQUOTA       0x2
-#define HAX_CAP_UG          0x4
 
 struct hax_capabilityinfo
 {