2bc292
From ecadfaec992fda7f485522c9ee6e7c9b05614a22 Mon Sep 17 00:00:00 2001
2bc292
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
2bc292
Date: Tue, 7 Dec 2021 18:39:47 +0000
2bc292
Subject: [PATCH 2/2] rhel machine types/x86: set prefer_sockets
2bc292
2bc292
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
2bc292
RH-MergeRequest: 59: rhel machine types/x86: set prefer_sockets
2bc292
RH-Commit: [1/1] 9bcd9e2c95154e39ef30a8a342ad6c713fa4f1fb (dagrh/c-9-s-qemu-kvm)
2bc292
RH-Bugzilla: 2028623
2bc292
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
2bc292
RH-Acked-by: quintela1 <quintela@redhat.com>
2bc292
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
2bc292
2bc292
When I fixed up the machine types for 8.5 I missed the
2bc292
  prefer_sockets = true
2bc292
2bc292
add them in; it looks like Power, ARM already have them, and I see them
2bc292
in thuth's s390 patch.
2bc292
2bc292
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
2bc292
---
2bc292
 hw/i386/pc_piix.c | 1 +
2bc292
 hw/i386/pc_q35.c  | 1 +
2bc292
 2 files changed, 2 insertions(+)
2bc292
2bc292
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
2bc292
index 183b5d5464..fccb7f5fc9 100644
2bc292
--- a/hw/i386/pc_piix.c
2bc292
+++ b/hw/i386/pc_piix.c
2bc292
@@ -973,6 +973,7 @@ static void pc_machine_rhel7_options(MachineClass *m)
2bc292
     compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
2bc292
     m->alias = "pc";
2bc292
     m->is_default = 1;
2bc292
+    m->smp_props.prefer_sockets = true;
2bc292
 }
2bc292
 
2bc292
 static void pc_init_rhel760(MachineState *machine)
2bc292
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
2bc292
index 0e7e885e78..3b748ddd7b 100644
2bc292
--- a/hw/i386/pc_q35.c
2bc292
+++ b/hw/i386/pc_q35.c
2bc292
@@ -662,6 +662,7 @@ static void pc_q35_machine_rhel850_options(MachineClass *m)
2bc292
                      hw_compat_rhel_8_5_len);
2bc292
     compat_props_add(m->compat_props, pc_rhel_8_5_compat,
2bc292
                      pc_rhel_8_5_compat_len);
2bc292
+    m->smp_props.prefer_sockets = true;
2bc292
 }
2bc292
 
2bc292
 DEFINE_PC_MACHINE(q35_rhel850, "pc-q35-rhel8.5.0", pc_q35_init_rhel850,
2bc292
-- 
2bc292
2.27.0
2bc292