From 780d8317c81c5632ccc44194aaca798e11e3acb9 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 6 Jun 2016 16:59:29 +0100 Subject: [PATCH] hw/arm/virt: Reject gic-version=host for non-KVM If you try to gic-version=host with TCG on a KVM aarch64 host, qemu segfaults, since host requires KVM APIs. Explicitly reject gic-version=host if KVM is not enabled https://bugzilla.redhat.com/show_bug.cgi?id=1339977 Signed-off-by: Cole Robinson Message-id: b1b3b0dd143b7995a7f4062966b80a2cf3e3c71e.1464273085.git.crobinso@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell (cherry picked from commit 0bf8039dca6bfecec243a13ebcd224d3941d9242) Signed-off-by: Michael Roth --- hw/arm/virt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 56d35c7716..a535285e4e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1114,10 +1114,14 @@ static void machvirt_init(MachineState *machine) * KVM is not available yet */ if (!gic_version) { + if (!kvm_enabled()) { + error_report("gic-version=host requires KVM"); + exit(1); + } + gic_version = kvm_arm_vgic_probe(); if (!gic_version) { error_report("Unable to determine GIC version supported by host"); - error_printf("KVM acceleration is probably not supported\n"); exit(1); } } -- 2.11.4.GIT