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

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