26ba25
From 738561e0b91258ad42765d669a62e9f28784fefe Mon Sep 17 00:00:00 2001
26ba25
From: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
Date: Thu, 31 May 2018 06:36:35 +0200
26ba25
Subject: [PATCH 005/268] Fix x-hv-max-vps compat value for 7.4 machine type
26ba25
26ba25
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
Message-id: <1527748595-28488-1-git-send-email-mrezanin@redhat.com>
26ba25
Patchwork-id: 80541
26ba25
O-Subject: [RHEL qemu-kvm/qemu-kvm-rhev PATCH] Fix x-hv-max-vps compat value for 7.4 machine type
26ba25
Bugzilla: 1583959
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
26ba25
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
26ba25
26ba25
Commit b2f9f4fcaad9c64f4551ab1dbe9e474c3dc6b2b4 increased the limit of vcpus
26ba25
for windows guest. In addition, it keep old limit for older machine types.
26ba25
However, due to conflict was compatibility part incorrectly placed and
26ba25
we keep this limit for 7.3 and older machine types instead of 7.4 and older.
26ba25
26ba25
Moving the chunk to correct spot so we have correct limit.
26ba25
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 include/hw/i386/pc.h | 11 +++++------
26ba25
 1 file changed, 5 insertions(+), 6 deletions(-)
26ba25
26ba25
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
26ba25
index c33ddbb..285e8df 100644
26ba25
--- a/include/hw/i386/pc.h
26ba25
+++ b/include/hw/i386/pc.h
26ba25
@@ -1019,9 +1019,13 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);
26ba25
             .driver   = "q35-pcihost",\
26ba25
             .property = "x-pci-hole64-fix",\
26ba25
             .value    = "off",\
26ba25
+        },\
26ba25
+        { /* PC_RHEL7_4_COMPAT from PC_COMPAT_2_10 */ \
26ba25
+             .driver   = TYPE_X86_CPU,\
26ba25
+             .property = "x-hv-max-vps",\
26ba25
+             .value    = "0x40",\
26ba25
         },
26ba25
 
26ba25
-
26ba25
 #define PC_RHEL7_3_COMPAT \
26ba25
         HW_COMPAT_RHEL7_3 \
26ba25
         { /* PC_RHEL7_3_COMPAT from PC_COMPAT_2_8 */ \
26ba25
@@ -1083,11 +1087,6 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);
26ba25
             .driver = TYPE_X86_CPU,\
26ba25
             .property = "kvm-no-smi-migration",\
26ba25
             .value    = "on",\
26ba25
-        },\
26ba25
-        { /* PC_RHEL7_4_COMPAT from PC_COMPAT_2_10 */ \
26ba25
-             .driver   = TYPE_X86_CPU,\
26ba25
-             .property = "x-hv-max-vps",\
26ba25
-             .value    = "0x40",\
26ba25
         },
26ba25
 
26ba25
 #define PC_RHEL7_2_COMPAT \
26ba25
-- 
26ba25
1.8.3.1
26ba25