cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ff9ada
From 0f0cbd57a8fe8f463941656f5bc75ae5754c3d2b Mon Sep 17 00:00:00 2001
ff9ada
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
ff9ada
Date: Tue, 7 Dec 2021 18:39:47 +0000
ff9ada
Subject: [PATCH 6/6] rhel machine types/x86: set prefer_sockets
ff9ada
ff9ada
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
ff9ada
RH-MergeRequest: 96: Fixup x86 prefer_sockets
ff9ada
RH-Commit: [1/1] 29578bcc2f5d3408c155c155cdfa10b7a12faf4d
ff9ada
RH-Bugzilla: 2029582
ff9ada
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
ff9ada
RH-Acked-by: quintela1 <quintela@redhat.com>
ff9ada
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
ff9ada
ff9ada
When I fixed up the machine types for 8.5 I missed the
ff9ada
  prefer_sockets = true
ff9ada
ff9ada
add them in; it looks like Power, ARM already have them, and I see them
ff9ada
in thuth's s390 patch.
ff9ada
ff9ada
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
ff9ada
---
ff9ada
 hw/i386/pc_piix.c | 1 +
ff9ada
 hw/i386/pc_q35.c  | 1 +
ff9ada
 2 files changed, 2 insertions(+)
ff9ada
ff9ada
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
ff9ada
index 37fab00733..c30057c443 100644
ff9ada
--- a/hw/i386/pc_piix.c
ff9ada
+++ b/hw/i386/pc_piix.c
ff9ada
@@ -1020,6 +1020,7 @@ static void pc_machine_rhel7_options(MachineClass *m)
ff9ada
     compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
ff9ada
     m->alias = "pc";
ff9ada
     m->is_default = 1;
ff9ada
+    m->smp_props.prefer_sockets = true;
ff9ada
 }
ff9ada
 
ff9ada
 static void pc_init_rhel760(MachineState *machine)
ff9ada
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
ff9ada
index 78876e1101..f6e77bca0e 100644
ff9ada
--- a/hw/i386/pc_q35.c
ff9ada
+++ b/hw/i386/pc_q35.c
ff9ada
@@ -662,6 +662,7 @@ static void pc_q35_machine_rhel850_options(MachineClass *m)
ff9ada
                      hw_compat_rhel_8_5_len);
ff9ada
     compat_props_add(m->compat_props, pc_rhel_8_5_compat,
ff9ada
                      pc_rhel_8_5_compat_len);
ff9ada
+    m->smp_props.prefer_sockets = true;
ff9ada
 }
ff9ada
 
ff9ada
 DEFINE_PC_MACHINE(q35_rhel850, "pc-q35-rhel8.5.0", pc_q35_init_rhel850,
ff9ada
-- 
ff9ada
2.27.0
ff9ada