aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-06-17 15:23:48 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-06-17 15:23:51 +0100
commit5de8229db542ab7a06e7355e7a095478cc73653a (patch)
tree6d4cce735a503975a786758b7cbc0c94ced70980
parent227a8653669a8526dcef1020982628282f44820d (diff)
target-arm/machine.c: Allow user to request GICv3 emulation
Now we have an emulated GICv3, remove the restriction in gicv3_class_name() so that the user can request a GICv3 with -machine gic-version=3 even when not using KVM. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org> Tested-by: Shannon Zhao <shannon.zhao@linaro.org> Message-id: 1465915112-29272-20-git-send-email-peter.maydell@linaro.org
-rw-r--r--target-arm/machine.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/target-arm/machine.c b/target-arm/machine.c
index 2f452603f1..2dbeb826cd 100644
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -342,8 +342,7 @@ const char *gicv3_class_name(void)
"platform");
#endif
} else {
- /* TODO: Software emulation is not implemented yet */
- error_report("KVM is currently required for GICv3 emulation");
+ return "arm-gicv3";
}
exit(1);