Merge remote-tracking branch 'sstabellini/tags/xen-20161122-tag' into staging

[mirror_qemu.git] / target-arm / kvm32.c

diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c
index 7f5935ab135dae2f726f54b17c008d9d49f40ad8..069da0c5fd101fedb912a60fd923c554a19c38bb 100644 (file)
--- a/target-arm/kvm32.c
+++ b/target-arm/kvm32.c
@@ -10,7 +10,6 @@
 
 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 
 #include <linux/kvm.h>
 
@@ -22,6 +21,7 @@
 #include "kvm_arm.h"
 #include "internals.h"
 #include "hw/arm/arm.h"
+#include "qemu/log.h"
 
 static inline void set_feature(uint64_t *features, int feature)
 {
@@ -521,3 +521,9 @@ bool kvm_arm_hw_debug_active(CPUState *cs)
 {
     return false;
 }
+
+int kvm_arm_pmu_create(CPUState *cs, int irq)
+{
+    qemu_log_mask(LOG_UNIMP, "%s: not implemented\n", __func__);
+    return 0;
+}