|
 |
29b115 |
From c8ad21ca31892f8798cf82508c2b2c61bf3b9895 Mon Sep 17 00:00:00 2001
|
|
|
29b115 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
Date: Mon, 4 Apr 2022 12:15:50 +0200
|
|
|
29b115 |
Subject: redhat: Update s390x machine type compatibility for rebase to QEMU
|
|
|
29b115 |
7.0.0
|
|
|
29b115 |
|
|
|
29b115 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
RH-MergeRequest: 143: Update machine type compatibility for QEMU 7.0.0 update [s390x]
|
|
|
29b115 |
RH-Commit: [23/23] 0ecf97d7bdddc50565b5779c64744b353f715cbd
|
|
|
29b115 |
RH-Bugzilla: 2064782
|
|
|
29b115 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
29b115 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
29b115 |
|
|
|
29b115 |
No s390x-specific machine class property updates required this time,
|
|
|
29b115 |
only an update to the default qemu cpu model.
|
|
|
29b115 |
|
|
|
29b115 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
---
|
|
|
29b115 |
hw/s390x/s390-virtio-ccw.c | 3 +++
|
|
|
29b115 |
1 file changed, 3 insertions(+)
|
|
|
29b115 |
|
|
|
29b115 |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
29b115 |
index 08e0f6a79b..4a491d4988 100644
|
|
|
29b115 |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
29b115 |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
29b115 |
@@ -1121,6 +1121,9 @@ DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
|
|
29b115 |
|
|
|
29b115 |
static void ccw_machine_rhel900_instance_options(MachineState *machine)
|
|
|
29b115 |
{
|
|
|
29b115 |
+ static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_2 };
|
|
|
29b115 |
+
|
|
|
29b115 |
+ s390_set_qemu_cpu_model(0x3906, 14, 2, qemu_cpu_feat);
|
|
|
29b115 |
}
|
|
|
29b115 |
|
|
|
29b115 |
static void ccw_machine_rhel900_class_options(MachineClass *mc)
|
|
|
29b115 |
--
|
|
|
29b115 |
2.31.1
|
|
|
29b115 |
|