From 812de4099cb2c81d0e109380eb29fb744c0fe855 Mon Sep 17 00:00:00 2001
From: Varinder Pratap <varinder.p@samsung.com>
Date: Fri, 24 Feb 2023 17:38:21 +0530
Subject: [PATCH] Fixed WHPX build for Ubuntu and MacOS

Change-Id: Ic4062c3593b0120097a41a25dfbfc91cea32d4d4
Signed-off-by: Varinder Pratap <varinder.p@samsung.com>
---
 configure              | 2 +-
 cpus.c                 | 1 -
 hw/i386/pc.c           | 2 +-
 include/sysemu/whpx.h  | 4 ----
 tizen/src/emul_state.c | 8 ++++----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index d700e0e77d..ea553b3f89 100755
--- 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 32a78db419..d469e2e533 100644
--- 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 4ba2ebba04..d9f2cc1d81 100644
--- 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 bfac265648..7894689f3f 100644
--- 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 5018766e27..a4fd253b3b 100644
--- 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"
-- 
2.34.1