[Qemu-devel] [PATCH 2/2] Remove CP15 timer from the device tree if KVM is used without in-kernel irqchip

[Pavel Fedin]

Signed-off-by: Pavel Fedin <address@hidden>
---
 hw/arm/boot.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 1e7fd28..35a2aa2 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -10,6 +10,7 @@
 #include "config.h"
 #include "hw/hw.h"
 #include "hw/arm/arm.h"
+#include "sysemu/kvm.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
@@ -426,6 +427,10 @@ static int load_dtb(hwaddr addr, const struct 
arm_boot_info *binfo,
         binfo->modify_dtb(binfo, fdt);
     }
 
+    if (kvm_enabled() && !kvm_irqchip_in_kernel()) {
+        qemu_fdt_remove_compatible(fdt, "arm,armv7-timer");
+    }
+
     qemu_fdt_dumpdtb(fdt, size);
 
     /* Put the DTB into the memory map as a ROM image: this will ensure
-- 
1.9.5.msysgit.0