[uq/master patch 1/2] kvm-all.c: use recommended max vcpus limit

[Marcelo Tosatti <mtosatti@redhat.com>]

[-- Attachment #1: kvm-all-use-cap-nr-vcpus-first --]
[-- Type: text/plain, Size: 940 bytes --]

Commit 8c3ba334f8588e1d5099f8602cf01897720e0eca, "KVM: x86: Raise the
hard VCPU count limit", upstream introduced the notion of a recommended
vcpu max limit.

Switch the order so the recommended vcpu max limit is used instead of
the actual max vcpu limit.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu/kvm-all.c
===================================================================
--- qemu.orig/kvm-all.c
+++ qemu/kvm-all.c
@@ -1321,11 +1321,11 @@ static int kvm_max_vcpus(KVMState *s)
      * procedure from the kernel API documentation to cope with
      * older kernels that may be missing capabilities.
      */
-    ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS);
+    ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS);
     if (ret) {
         return ret;
     }
-    ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS);
+    ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS);
     if (ret) {
         return ret;
     }