hyperv: fix build on non-KVM hosts

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/Makefile.target b/Makefile.target
index 092565a1e824c16c2d4c4d2cfeac94dcf2e4c7a2..69193d4938d97aafd8c443037a4a795cdfb0a83e 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -201,7 +201,7 @@ obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
 obj-y += memory.o savevm.o
 LIBS+=-lz
 
-obj-i386-y +=hyperv.o
+obj-i386-$(CONFIG_KVM) += hyperv.o
 
 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
 QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

diff --git a/target-i386/hyperv.h b/target-i386/hyperv.h
index 15467bf3970dd684cb369c01dfd454484c9ce6f1..bacb1d43738df00e141c6a1cfaba5142e6015d7b 100644 (file)
--- a/target-i386/hyperv.h
+++ b/target-i386/hyperv.h
@@ -14,7 +14,9 @@
 #define QEMU_HW_HYPERV_H 1
 
 #include "qemu-common.h"
+#ifdef CONFIG_KVM
 #include <asm/hyperv.h>
+#endif
 
 #ifndef HYPERV_SPINLOCK_NEVER_RETRY
 #define HYPERV_SPINLOCK_NEVER_RETRY             0xFFFFFFFF
@@ -24,7 +26,7 @@
 #define KVM_CPUID_SIGNATURE_NEXT                0x40000100
 #endif
 
-#ifndef CONFIG_USER_ONLY
+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_KVM)
 void hyperv_enable_vapic_recommended(bool val);
 void hyperv_enable_relaxed_timing(bool val);
 void hyperv_set_spinlock_retries(int val);