Skip to contentSkip to conversation

s390x: add zPCI feature to "qemu" CPU model

PATCH Applied David Hildenbrand 3 participants 5 messages Feb 12, 2019 – Feb 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 s390x: add zPCI feature to "qemu" CPU model

As we now always have PCI support, let's add it to the "qemu" CPU model, taking care of backwards compatibility.

---

v1 -> v2:
- Use correct model identifiction of the z12 we emulate

 hw/s390x/s390-virtio-ccw.c  | 3 +++
 target/s390x/gen-features.c | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
hw/s390x/s390-virtio-ccw.c +3 -0
index 3fb5c88af9..1a3414b642 100644
@@ -657,7 +657,10 @@ DEFINE_CCW_MACHINE(4_0, "4.0", true);
 
 static void ccw_machine_3_1_instance_options(MachineState *machine)
 {
+    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };
     ccw_machine_4_0_instance_options(machine);
+
+    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
 }
 
 static void ccw_machine_3_1_class_options(MachineClass *mc)
target/s390x/gen-features.c +6 -2
index b0e9b271e2..19bb8ac7f8 100644
@@ -560,7 +560,7 @@ static uint16_t qemu_V2_11[] = {
     S390_FEAT_ZARCH,
 };
 
-static uint16_t qemu_LATEST[] = {
+static uint16_t qemu_V3_1[] = {
     S390_FEAT_DAT_ENH,
     S390_FEAT_IDTE_SEGMENT,
     S390_FEAT_STFLE,
@@ -592,13 +592,16 @@ static uint16_t qemu_LATEST[] = {
     S390_FEAT_MSA_EXT_4,
 };
 
+static uint16_t qemu_LATEST[] = {
+    S390_FEAT_ZPCI,
+};
+
 /* add all new definitions before this point */
 static uint16_t qemu_MAX[] = {
     /* z13+ features */
     S390_FEAT_STFLE_53,
     /* generates a dependency warning, leave it out for now */
     S390_FEAT_MSA_EXT_5,
-    S390_FEAT_ZPCI,
 };
 
 /****** END FEATURE DEFS ******/
@@ -708,6 +711,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
  *******************************/
 static FeatGroupDefSpec QemuFeatDef[] = {
     QEMU_FEAT_INITIALIZER(V2_11),
+    QEMU_FEAT_INITIALIZER(V3_1),
     QEMU_FEAT_INITIALIZER(LATEST),
     QEMU_FEAT_INITIALIZER(MAX),
 };
Signature · 1 line
2.17.2
#1 lore raw
Quoted 4 lines · On Tue, 12 Feb 2019 12:23:23 +0100 David Hildenbrand <[email protected]> wrote:

As we now always have PCI support, let's add it to the "qemu" CPU model, taking care of backwards compatibility.

Quoted 9 lines

---

v1 -> v2:
- Use correct model identifiction of the z12 we emulate

 hw/s390x/s390-virtio-ccw.c  | 3 +++
 target/s390x/gen-features.c | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Played around a bit with different machines and cpu models and got what I expected.

Thanks, applied.

#2 lore raw
In reply to David Hildenbrand

I noticed the qemu-iotests 200 was failing due to the commit "703fef6fcf3 : s390x/pci: Warn when adding PCI devices without the 'zpci' feature".

This patch fixes the failure :).

Thanks
Farhan

Quoted 12 lines · David Hildenbrand

As we now always have PCI support, let's add it to the "qemu" CPU model, taking care of backwards compatibility.

---

v1 -> v2:
- Use correct model identifiction of the z12 we emulate

  hw/s390x/s390-virtio-ccw.c  | 3 +++
  target/s390x/gen-features.c | 8 ++++++--
  2 files changed, 9 insertions(+), 2 deletions(-)
#3 lore raw
Quoted 5 lines · On Wed, 13 Feb 2019 10:54:23 -0500 Farhan Ali <[email protected]> wrote:

I noticed the qemu-iotests 200 was failing due to the commit "703fef6fcf3 : s390x/pci: Warn when adding PCI devices without the 'zpci' feature".

This patch fixes the failure :).

Huh. So it was testing without pci before and now with and it's also working? Awesome :)

Quoted 18 lines

Thanks
Farhan

Quoted 12 lines · David Hildenbrand

As we now always have PCI support, let's add it to the "qemu" CPU model, taking care of backwards compatibility.

---

v1 -> v2:
- Use correct model identifiction of the z12 we emulate

  hw/s390x/s390-virtio-ccw.c  | 3 +++
  target/s390x/gen-features.c | 8 ++++++--
  2 files changed, 9 insertions(+), 2 deletions(-)  
#4 lore raw
Quoted 11 lines · Cornelia Huck
Quoted 5 lines · On Wed, 13 Feb 2019 10:54:23 -0500 Farhan Ali <[email protected]> wrote:

I noticed the qemu-iotests 200 was failing due to the commit "703fef6fcf3 : s390x/pci: Warn when adding PCI devices without the 'zpci' feature".

This patch fixes the failure :).

Huh. So it was testing without pci before and now with and it's also working? Awesome :)

It was testing with pci, but the reason it fails was because qemu was spitting out the warning due to commit 703fef6fcf3. Now David's commit adds the zpci to qemu cpu model and qemu doesn't give out a warning message.

Quoted 21 lines
Quoted 19 lines

Thanks
Farhan

Quoted 12 lines · David Hildenbrand

As we now always have PCI support, let's add it to the "qemu" CPU model, taking care of backwards compatibility.

---

v1 -> v2:
- Use correct model identifiction of the z12 we emulate

   hw/s390x/s390-virtio-ccw.c  | 3 +++
   target/s390x/gen-features.c | 8 ++++++--
   2 files changed, 9 insertions(+), 2 deletions(-)