[Qemu-devel] [PATCH 5/7] kvm-ppc: fix build for ppc64-softmmu

[Xuebing Wang <xbing6@gmail.com>]

The build issue was caused by the patch of removing
"#if defined CONFIG_KVM || !defined NEED_CPU_H"

Signed-off-by: Xuebing Wang <xbing6@gmail.com>
---
 target-ppc/kvm_ppc.h |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index 5f78e4b..c532d2a 100644
--- a/target-ppc/kvm_ppc.h
+++ b/target-ppc/kvm_ppc.h
@@ -11,7 +11,19 @@
 
 #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
 
+/* Adding "config-target.h" is to ensure this header file is correct by itself.
+ *
+ * Only source files in *-softmmu/ or *-linux-user/ folder can
+ * include "config-target.h". If this header is incorrectly included,
+ * compiler errors out.
+ */
+#include "config-target.h" /* for CONFIG_KVM, CONFIG_USER_ONLY */
+
+#ifdef CONFIG_KVM
 void kvmppc_init(void);
+#else
+static inline void kvmppc_init(void) {}
+#endif
 
 #ifdef CONFIG_KVM
 
-- 
1.7.9.5