summary refs log tree commit diff stats
path: root/accel/stubs/kvm-stub.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-13 10:47:10 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-13 10:47:10 +0100
commit6e2c46334385c7e295ac883c801c81b4925fb54f (patch)
tree44ddadc2d77a47bb95e77fb5b7463792cb2e598c /accel/stubs/kvm-stub.c
parent31fe1c414501047cbb91b695bdccc0068496dcf6 (diff)
parent792dac309c8660306557ba058b8b5a6a75ab3c1f (diff)
downloadfocaccia-qemu-6e2c46334385c7e295ac883c801c81b4925fb54f.tar.gz
focaccia-qemu-6e2c46334385c7e295ac883c801c81b4925fb54f.zip
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170711' into staging
target-arm queue:
 * v7M: ignore writes to CONTROL.SPSEL from Thread mode
 * KVM: Enable in-kernel timers with user space gic
 * aspeed: Register all watchdogs
 * hw/misc: Add Exynos4210 Pseudo Random Number Generator

# gpg: Signature made Tue 11 Jul 2017 11:28:15 BST
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20170711:
  target-arm: v7M: ignore writes to CONTROL.SPSEL from Thread mode
  ARM: KVM: Enable in-kernel timers with user space gic
  aspeed: Register all watchdogs
  hw/misc: Add Exynos4210 Pseudo Random Number Generator

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel/stubs/kvm-stub.c')
-rw-r--r--accel/stubs/kvm-stub.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index ef0c7346af..3965c528d3 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -155,4 +155,9 @@ void kvm_init_cpu_signals(CPUState *cpu)
 {
     abort();
 }
+
+bool kvm_arm_supports_user_irq(void)
+{
+    return false;
+}
 #endif