Blame SOURCES/kvm-Fix-x-hv-max-vps-compat-value-for-7.4-machine-type.patch

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