Fixed WHPX build for Ubuntu and MacOS

Change-Id: Ic4062c3593b0120097a41a25dfbfc91cea32d4d4
Signed-off-by: Varinder Pratap <varinder.p@samsung.com>

diff --git a/configure b/configure
index d700e0e..ea553b3 100755 (executable)
--- a/configure
+++ b/configure
@@ -237,7 +237,7 @@ vhost_vsock="no"
 kvm="no"
 hax="no"
 colo="yes"
-whpx="yes"
+whpx="no"
 rdma=""
 gprof="no"
 debug_tcg="no"

diff --git a/cpus.c b/cpus.c
index 32a78db..d469e2e 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -42,7 +42,6 @@
 #include "qemu/thread.h"
 #include "sysemu/cpus.h"
 #include "sysemu/qtest.h"
-#include "sysemu/whpx.h"
 #include "qemu/main-loop.h"
 #include "qemu/bitmap.h"
 #include "qemu/seqlock.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 4ba2ebb..d9f2cc1 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2123,7 +2123,7 @@ bool pc_machine_is_smm_enabled(PCMachineState *pcms)
         smm_available = true;
     } else if (kvm_enabled()) {
         smm_available = kvm_has_smm();
-    } else if (hax_enabled() || whpx_enabled) {
+    } else if (hax_enabled() || whpx_enabled()) {
         smm_available = false;
     }
 

diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h
index bfac265..7894689 100644 (file)
--- a/include/sysemu/whpx.h
+++ b/include/sysemu/whpx.h
@@ -13,8 +13,6 @@
 #ifndef QEMU_WHPX_H
 #define QEMU_WHPX_H
 
-#ifdef NEED_CPU_H
-
 #ifdef CONFIG_WHPX
 
 #include "sysemu/cpus.h"
@@ -56,6 +54,4 @@ void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu);
 
 #endif /* CONFIG_WHPX */
 
-#endif /* NEED_CPU_H */
-
 #endif /* QEMU_WHPX_H */

diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index 5018766..a4fd253 100644 (file)
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "emul_state.h"
 
 #include <libgen.h>
@@ -39,14 +40,13 @@
 #include "sysemu/kvm.h"
 #elif defined(CONFIG_WIN32)
 #include <windows.h>
-#include "sysemu/hax.h"
-#include "sysemu/whpx.h"
 #elif defined(CONFIG_DARWIN)
 #include <fcntl.h>
-#include "sysemu/hax.h"
 #endif
 
-#include "qemu/osdep.h"
+#include "sysemu/hax.h"
+#include "sysemu/whpx.h"
+
 #include "ui/console.h"
 #include "sysemu/sysemu.h"
 #include "block/block_int.h"