diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-06-23 10:05:12 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-06-26 17:35:47 +0000 |
| commit | af2be2077734e0ebfc8afbe6caf0f89a1474eef2 (patch) | |
| tree | 9c72a60fdd424fcfe8c1d7f27e5093308b2e696c /target-s390x | |
| parent | 744d3644181ddb16ef5944a0f9217e46961c8c84 (diff) | |
Fix fallouts from Linux header inclusion
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 <jan.kiszka@siemens.com>
Tested-by: Andreas Färber <andreas.faerber@web.de>
Tested-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/op_helper.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 <string.h> #include "kvm.h" -#include <linux/kvm.h> #include "qemu-timer.h" +#ifdef CONFIG_KVM +#include <linux/kvm.h> +#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; |