aboutsummaryrefslogtreecommitdiff
path: root/target-s390x
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-06-08 16:10:57 +0200
committerMarcelo Tosatti <mtosatti@redhat.com>2011-06-20 15:16:12 -0300
commite205c7902f01664f4ad6dccc32ba1472e6d32d34 (patch)
treeba16a1cff9c265986e4700e91acaec7d6ee24c7e /target-s390x
parent51b24e34d4f56e51b8541f54b8c01d935dbe9eca (diff)
downloadqemu-e205c7902f01664f4ad6dccc32ba1472e6d32d34.zip
qemu-e205c7902f01664f4ad6dccc32ba1472e6d32d34.tar.gz
qemu-e205c7902f01664f4ad6dccc32ba1472e6d32d34.tar.bz2
Switch build system to accompanied kernel headers
This helps reducing our build-time checks for feature support in the available Linux kernel headers. And it helps users that do not have sufficiently recent headers installed on their build machine. Consequently, the patch removes and build-time checks for kvm and vhost in configure, the --kerneldir switch, and KVM_CFLAGS. Kernel headers are supposed to be provided by QEMU only. s390 needs some extra love as it carries redefinitions from kernel headers. CC: Alexander Graf <agraf@suse.de> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-s390x')
-rw-r--r--target-s390x/cpu.h10
-rw-r--r--target-s390x/op_helper.c1
2 files changed, 1 insertions, 10 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 4e5c391..b5e587f 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -313,16 +313,6 @@ CPUState *s390_cpu_addr2state(uint16_t cpu_addr);
/* from s390-virtio-bus */
extern const target_phys_addr_t virtio_size;
-#ifndef KVM_S390_SIGP_STOP
-#define KVM_S390_SIGP_STOP 0
-#define KVM_S390_PROGRAM_INT 0
-#define KVM_S390_SIGP_SET_PREFIX 0
-#define KVM_S390_RESTART 0
-#define KVM_S390_INT_VIRTIO 0
-#define KVM_S390_INT_SERVICE 0
-#define KVM_S390_INT_EMERGENCY 0
-#endif
-
#endif
void cpu_lock(void);
void cpu_unlock(void);
diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c
index db03a79..9429698 100644
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -23,6 +23,7 @@
#include "helpers.h"
#include <string.h>
#include "kvm.h"
+#include <linux/kvm.h>
#include "qemu-timer.h"
/*****************************************************************************/