From 516fc0a081161eab5b3a89c7f243954945ee390e Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 10 Mar 2021 14:52:17 +0100 Subject: accel: kvm: Fix kvm_type invocation Prior to commit f2ce39b4f067 a MachineClass kvm_type method only needed to be registered to ensure it would be executed. With commit f2ce39b4f067 a kvm-type machine property must also be specified. hw/arm/virt relies on the kvm_type method to pass its selected IPA limit to KVM, but this is not exposed as a machine property. Restore the previous functionality of invoking kvm_type when it's present. Fixes: f2ce39b4f067 ("vl: make qemu_get_machine_opts static") Signed-off-by: Andrew Jones Reviewed-by: Eric Auger Message-id: 20210310135218.255205-2-drjones@redhat.com Signed-off-by: Peter Maydell --- accel/kvm/kvm-all.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'accel') diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f88a523..37b0a18 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2068,6 +2068,8 @@ static int kvm_init(MachineState *ms) "kvm-type", &error_abort); type = mc->kvm_type(ms, kvm_type); + } else if (mc->kvm_type) { + type = mc->kvm_type(ms, NULL); } do { -- cgit v1.1