]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size
authorVitaly Kuznetsov <vkuznets@redhat.com>
Thu, 22 Apr 2021 16:11:23 +0000 (18:11 +0200)
committerEduardo Habkost <ehabkost@redhat.com>
Mon, 31 May 2021 19:53:03 +0000 (15:53 -0400)
SYNDBG leaves were recently (Linux-5.8) added to KVM but we haven't
updated the expected size of KVM_GET_SUPPORTED_HV_CPUID output in
KVM so we now make serveral tries before succeeding. Update the
default.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20210422161130.652779-13-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
target/i386/kvm/kvm.c

index 413f57df36701212cf7d58c62755b2d4f4b555c5..9005a4233f09ec926eeb38216725efa31bea0af0 100644 (file)
@@ -962,7 +962,8 @@ static struct kvm_cpuid2 *try_get_hv_cpuid(CPUState *cs, int max)
 static struct kvm_cpuid2 *get_supported_hv_cpuid(CPUState *cs)
 {
     struct kvm_cpuid2 *cpuid;
-    int max = 7; /* 0x40000000..0x40000005, 0x4000000A */
+    /* 0x40000000..0x40000005, 0x4000000A, 0x40000080..0x40000080 leaves */
+    int max = 10;
     int i;
 
     /*