From af2be2077734e0ebfc8afbe6caf0f89a1474eef2 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 23 Jun 2011 10:05:12 +0200 Subject: Fix fallouts from Linux header inclusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is an all-in-one fix for the smaller and bigger mistakes of the build system changes for accompanied Linux headers: - only enable KVM and vhost on Linux hosts - fix powerpc asm header symlink - do not use Linux headers on non-Linux hosts - fix kvmclock for !CONFIG_KVM - fix s390 build on non-Linux hosts Signed-off-by: Jan Kiszka Tested-by: Andreas Färber Tested-by: Stefan Weil Signed-off-by: Blue Swirl --- target-s390x/op_helper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'target-s390x') diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index 9429698c2c..6a3c1f6cc7 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -23,8 +23,10 @@ #include "helpers.h" #include #include "kvm.h" -#include #include "qemu-timer.h" +#ifdef CONFIG_KVM +#include +#endif /*****************************************************************************/ /* Softmmu support */ @@ -2332,7 +2334,9 @@ static void program_interrupt(CPUState *env, uint32_t code, int ilc) qemu_log("program interrupt at %#" PRIx64 "\n", env->psw.addr); if (kvm_enabled()) { +#ifdef CONFIG_KVM kvm_s390_interrupt(env, KVM_S390_PROGRAM_INT, code); +#endif } else { env->int_pgm_code = code; env->int_pgm_ilc = ilc; -- cgit v1.2.1