Skip to contentSkip to conversation

hw: Add compat machines for 8.0

PATCH Superseded Cornelia Huck 4 participants 8 messages Nov 11, 2022 – Nov 18, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw: Add compat machines for 8.0

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---
 hw/arm/virt.c              |  9 ++++++++-
 hw/core/machine.c          |  3 +++
 hw/i386/pc.c               |  3 +++
 hw/i386/pc_piix.c          | 14 +++++++++++++-
 hw/i386/pc_q35.c           | 13 ++++++++++++-
 hw/m68k/virt.c             |  9 ++++++++-
 hw/ppc/spapr.c             | 15 +++++++++++++--
 hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
 include/hw/boards.h        |  3 +++
 include/hw/i386/pc.h       |  3 +++
 10 files changed, 79 insertions(+), 7 deletions(-)
hw/arm/virt.c +8 -1
index b87135085610..2a46660980e7 100644
@@ -3096,10 +3096,17 @@ static void machvirt_machine_init(void)
 }
 type_init(machvirt_machine_init);
 
+static void virt_machine_8_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(8, 0)
+
 static void virt_machine_7_2_options(MachineClass *mc)
 {
+    virt_machine_8_0_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
+DEFINE_VIRT_MACHINE(7, 2)
 
 static void virt_machine_7_1_options(MachineClass *mc)
 {
hw/core/machine.c +3 -0
index 8d34caa31dc8..f264fb53b46c 100644
@@ -40,6 +40,9 @@
 #include "hw/virtio/virtio-pci.h"
 #include "qom/object_interfaces.h"
 
+GlobalProperty hw_compat_7_2[] ={};
+const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
+
 GlobalProperty hw_compat_7_1[] = {
     { "virtio-device", "queue_reset", "false" },
 };
hw/i386/pc.c +3 -0
index 546b703cb42c..9aeff77e9dca 100644
@@ -107,6 +107,9 @@
     { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
     { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
 
+GlobalProperty pc_compat_7_2[] = {};
+const size_t pc_compat_7_2_len = G_N_ELEMENTS(pc_compat_7_2);
+
 GlobalProperty pc_compat_7_1[] = {};
 const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1);
 
hw/i386/pc_piix.c +13 -1
index 0ad0ed160387..1c0a7b83b545 100644
@@ -435,7 +435,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
 }
 
-static void pc_i440fx_7_2_machine_options(MachineClass *m)
+static void pc_i440fx_8_0_machine_options(MachineClass *m)
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_i440fx_machine_options(m);
@@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
     pcmc->default_cpu_version = 1;
 }
 
+DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
+                      pc_i440fx_8_0_machine_options);
+
+static void pc_i440fx_7_2_machine_options(MachineClass *m)
+{
+    pc_i440fx_8_0_machine_options(m);
+    m->alias = NULL;
+    m->is_default = false;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
 DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
                       pc_i440fx_7_2_machine_options);
 
hw/i386/pc_q35.c +12 -1
index a496bd6e74f5..10bb49f679b0 100644
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
-static void pc_q35_7_2_machine_options(MachineClass *m)
+static void pc_q35_8_0_machine_options(MachineClass *m)
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_q35_machine_options(m);
@@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
     pcmc->default_cpu_version = 1;
 }
 
+DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
+                   pc_q35_8_0_machine_options);
+
+static void pc_q35_7_2_machine_options(MachineClass *m)
+{
+    pc_q35_8_0_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
 DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
                    pc_q35_7_2_machine_options);
 
hw/m68k/virt.c +8 -1
index da5eafd2756f..4cb5beef1a0c 100644
@@ -346,10 +346,17 @@ type_init(virt_machine_register_types)
     } \
     type_init(machvirt_machine_##major##_##minor##_init);
 
+static void virt_machine_8_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(8, 0, true)
+
 static void virt_machine_7_2_options(MachineClass *mc)
 {
+    virt_machine_8_0_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_VIRT_MACHINE(7, 2, true)
+DEFINE_VIRT_MACHINE(7, 2, false)
 
 static void virt_machine_7_1_options(MachineClass *mc)
 {
hw/ppc/spapr.c +13 -2
index 66b414d2e9ba..da9c84c1198f 100644
@@ -4733,15 +4733,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 
+/*
+ * pseries-8.0
+ */
+static void spapr_machine_8_0_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(8_0, "8.0", true);
+
 /*
  * pseries-7.2
  */
 static void spapr_machine_7_2_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_8_0_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
 
-DEFINE_SPAPR_MACHINE(7_2, "7.2", true);
+DEFINE_SPAPR_MACHINE(7_2, "7.2", false);
 
 /*
  * pseries-7.1
hw/s390x/s390-virtio-ccw.c +13 -1
index 7d80bc183716..9d2f7c309f75 100644
@@ -823,14 +823,26 @@ bool css_migration_enabled(void)
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 
+static void ccw_machine_8_0_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_8_0_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(8_0, "8.0", true);
+
 static void ccw_machine_7_2_instance_options(MachineState *machine)
 {
+    ccw_machine_8_0_instance_options(machine);
 }
 
 static void ccw_machine_7_2_class_options(MachineClass *mc)
 {
+    ccw_machine_8_0_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_CCW_MACHINE(7_2, "7.2", true);
+DEFINE_CCW_MACHINE(7_2, "7.2", false);
 
 static void ccw_machine_7_1_instance_options(MachineState *machine)
 {
include/hw/boards.h +3 -0
index 90f1dd3aeb79..d18d6d007335 100644
@@ -379,6 +379,9 @@ struct MachineState {
     } \
     type_init(machine_initfn##_register_types)
 
+extern GlobalProperty hw_compat_7_2[];
+extern const size_t hw_compat_7_2_len;
+
 extern GlobalProperty hw_compat_7_1[];
 extern const size_t hw_compat_7_1_len;
 
include/hw/i386/pc.h +3 -0
index c95333514ed3..991f905f5d25 100644
@@ -200,6 +200,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
 /* sgx.c */
 void pc_machine_init_sgx_epc(PCMachineState *pcms);
 
+extern GlobalProperty pc_compat_7_2[];
+extern const size_t pc_compat_7_2_len;
+
 extern GlobalProperty pc_compat_7_1[];
 extern const size_t pc_compat_7_1_len;
 
Signature · 1 line
2.38.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 16 lines · Cornelia Huck

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---
  hw/arm/virt.c              |  9 ++++++++-
  hw/core/machine.c          |  3 +++
  hw/i386/pc.c               |  3 +++
  hw/i386/pc_piix.c          | 14 +++++++++++++-
  hw/i386/pc_q35.c           | 13 ++++++++++++-
  hw/m68k/virt.c             |  9 ++++++++-
  hw/ppc/spapr.c             | 15 +++++++++++++--
  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
  include/hw/boards.h        |  3 +++
  include/hw/i386/pc.h       |  3 +++
  10 files changed, 79 insertions(+), 7 deletions(-)

For ppc,

Thanks,

C.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Cornelia Huck
Quoted 16 lines · Cornelia Huck

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---
  hw/arm/virt.c              |  9 ++++++++-
  hw/core/machine.c          |  3 +++
  hw/i386/pc.c               |  3 +++
  hw/i386/pc_piix.c          | 14 +++++++++++++-
  hw/i386/pc_q35.c           | 13 ++++++++++++-
  hw/m68k/virt.c             |  9 ++++++++-
  hw/ppc/spapr.c             | 15 +++++++++++++--
  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
  include/hw/boards.h        |  3 +++
  include/hw/i386/pc.h       |  3 +++
  10 files changed, 79 insertions(+), 7 deletions(-)

For the s390x part:

Reviewed-by on v1 1/1
#3 lore raw
In reply to Cornelia Huck
Quoted 44 lines · On Fri, 11 Nov 2022 13:45:34 +0100 Cornelia Huck <[email protected]> wrote:

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---
 hw/arm/virt.c              |  9 ++++++++-
 hw/core/machine.c          |  3 +++
 hw/i386/pc.c               |  3 +++
 hw/i386/pc_piix.c          | 14 +++++++++++++-
 hw/i386/pc_q35.c           | 13 ++++++++++++-
 hw/m68k/virt.c             |  9 ++++++++-
 hw/ppc/spapr.c             | 15 +++++++++++++--
 hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
 include/hw/boards.h        |  3 +++
 include/hw/i386/pc.h       |  3 +++
 10 files changed, 79 insertions(+), 7 deletions(-)
hw/arm/virt.c +8 -1
index b87135085610..2a46660980e7 100644
@@ -3096,10 +3096,17 @@ static void machvirt_machine_init(void)
 }
 type_init(machvirt_machine_init);
 
+static void virt_machine_8_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(8, 0)
+
 static void virt_machine_7_2_options(MachineClass *mc)
 {
+    virt_machine_8_0_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
+DEFINE_VIRT_MACHINE(7, 2)
 
 static void virt_machine_7_1_options(MachineClass *mc)
 {
hw/core/machine.c +0 -0
index 8d34caa31dc8..f264fb53b46c 100644

hw/core/machine.c line 43

Quoted 4 lines
hw/core/machine.c +1 -0
@@ -40,6 +40,9 @@
 #include "hw/virtio/virtio-pci.h"
 #include "qom/object_interfaces.h"
 
+GlobalProperty hw_compat_7_2[] ={};

Missing space between '=' and '{}'.

Anyway, for ppc parts:

Quoted 198 lines
hw/core/machine.c +2 -0
+const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
+
 GlobalProperty hw_compat_7_1[] = {
     { "virtio-device", "queue_reset", "false" },
 };
hw/i386/pc.c +3 -0
index 546b703cb42c..9aeff77e9dca 100644
@@ -107,6 +107,9 @@
     { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
     { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
 
+GlobalProperty pc_compat_7_2[] = {};
+const size_t pc_compat_7_2_len = G_N_ELEMENTS(pc_compat_7_2);
+
 GlobalProperty pc_compat_7_1[] = {};
 const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1);
 
hw/i386/pc_piix.c +13 -1
index 0ad0ed160387..1c0a7b83b545 100644
@@ -435,7 +435,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
 }
 
-static void pc_i440fx_7_2_machine_options(MachineClass *m)
+static void pc_i440fx_8_0_machine_options(MachineClass *m)
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_i440fx_machine_options(m);
@@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
     pcmc->default_cpu_version = 1;
 }
 
+DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
+                      pc_i440fx_8_0_machine_options);
+
+static void pc_i440fx_7_2_machine_options(MachineClass *m)
+{
+    pc_i440fx_8_0_machine_options(m);
+    m->alias = NULL;
+    m->is_default = false;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
 DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
                       pc_i440fx_7_2_machine_options);
 
hw/i386/pc_q35.c +12 -1
index a496bd6e74f5..10bb49f679b0 100644
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
-static void pc_q35_7_2_machine_options(MachineClass *m)
+static void pc_q35_8_0_machine_options(MachineClass *m)
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_q35_machine_options(m);
@@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
     pcmc->default_cpu_version = 1;
 }
 
+DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
+                   pc_q35_8_0_machine_options);
+
+static void pc_q35_7_2_machine_options(MachineClass *m)
+{
+    pc_q35_8_0_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
 DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
                    pc_q35_7_2_machine_options);
 
hw/m68k/virt.c +8 -1
index da5eafd2756f..4cb5beef1a0c 100644
@@ -346,10 +346,17 @@ type_init(virt_machine_register_types)
     } \
     type_init(machvirt_machine_##major##_##minor##_init);
 
+static void virt_machine_8_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(8, 0, true)
+
 static void virt_machine_7_2_options(MachineClass *mc)
 {
+    virt_machine_8_0_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_VIRT_MACHINE(7, 2, true)
+DEFINE_VIRT_MACHINE(7, 2, false)
 
 static void virt_machine_7_1_options(MachineClass *mc)
 {
hw/ppc/spapr.c +13 -2
index 66b414d2e9ba..da9c84c1198f 100644
@@ -4733,15 +4733,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 
+/*
+ * pseries-8.0
+ */
+static void spapr_machine_8_0_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(8_0, "8.0", true);
+
 /*
  * pseries-7.2
  */
 static void spapr_machine_7_2_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_8_0_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
 
-DEFINE_SPAPR_MACHINE(7_2, "7.2", true);
+DEFINE_SPAPR_MACHINE(7_2, "7.2", false);
 
 /*
  * pseries-7.1
hw/s390x/s390-virtio-ccw.c +13 -1
index 7d80bc183716..9d2f7c309f75 100644
@@ -823,14 +823,26 @@ bool css_migration_enabled(void)
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 
+static void ccw_machine_8_0_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_8_0_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(8_0, "8.0", true);
+
 static void ccw_machine_7_2_instance_options(MachineState *machine)
 {
+    ccw_machine_8_0_instance_options(machine);
 }
 
 static void ccw_machine_7_2_class_options(MachineClass *mc)
 {
+    ccw_machine_8_0_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_CCW_MACHINE(7_2, "7.2", true);
+DEFINE_CCW_MACHINE(7_2, "7.2", false);
 
 static void ccw_machine_7_1_instance_options(MachineState *machine)
 {
include/hw/boards.h +3 -0
index 90f1dd3aeb79..d18d6d007335 100644
@@ -379,6 +379,9 @@ struct MachineState {
     } \
     type_init(machine_initfn##_register_types)
 
+extern GlobalProperty hw_compat_7_2[];
+extern const size_t hw_compat_7_2_len;
+
 extern GlobalProperty hw_compat_7_1[];
 extern const size_t hw_compat_7_1_len;
 
include/hw/i386/pc.h +3 -0
index c95333514ed3..991f905f5d25 100644
@@ -200,6 +200,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
 /* sgx.c */
 void pc_machine_init_sgx_epc(PCMachineState *pcms);
 
+extern GlobalProperty pc_compat_7_2[];
+extern const size_t pc_compat_7_2_len;
+
 extern GlobalProperty pc_compat_7_1[];
 extern const size_t pc_compat_7_1_len;
 
#4 lore raw
Quoted 50 lines · Greg Kurz
Quoted 47 lines · On Fri, 11 Nov 2022 13:45:34 +0100 Cornelia Huck <[email protected]> wrote:

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---
 hw/arm/virt.c              |  9 ++++++++-
 hw/core/machine.c          |  3 +++
 hw/i386/pc.c               |  3 +++
 hw/i386/pc_piix.c          | 14 +++++++++++++-
 hw/i386/pc_q35.c           | 13 ++++++++++++-
 hw/m68k/virt.c             |  9 ++++++++-
 hw/ppc/spapr.c             | 15 +++++++++++++--
 hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
 include/hw/boards.h        |  3 +++
 include/hw/i386/pc.h       |  3 +++
 10 files changed, 79 insertions(+), 7 deletions(-)
hw/arm/virt.c +8 -1
index b87135085610..2a46660980e7 100644
@@ -3096,10 +3096,17 @@ static void machvirt_machine_init(void)
 }
 type_init(machvirt_machine_init);
 
+static void virt_machine_8_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(8, 0)
+
 static void virt_machine_7_2_options(MachineClass *mc)
 {
+    virt_machine_8_0_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
 }
-DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
+DEFINE_VIRT_MACHINE(7, 2)
 
 static void virt_machine_7_1_options(MachineClass *mc)
 {
hw/core/machine.c +0 -0
index 8d34caa31dc8..f264fb53b46c 100644
@@ -40,6 +40,9 @@
 #include "hw/virtio/virtio-pci.h"
 #include "qom/object_interfaces.h"
 
Quoted 3 lines

hw/core/machine.c line 43

Quoted 1 line
hw/core/machine.c +1 -0
+GlobalProperty hw_compat_7_2[] ={};

Missing space between '=' and '{}'.

Oops. Maybe this can be fixed up by whoever ends up applying this, or maybe this will be changed by another patch immediately anyway.

Quoted 4 lines

Anyway, for ppc parts:

Thanks :)

#5 lore raw
In reply to Cornelia Huck
Quoted 4 lines · Cornelia Huck

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---

...

Quoted 14 lines
hw/i386/pc_piix.c +1 -1
index 0ad0ed160387..1c0a7b83b545 100644
@@ -435,7 +435,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
      machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
  }
 
-static void pc_i440fx_7_2_machine_options(MachineClass *m)
+static void pc_i440fx_8_0_machine_options(MachineClass *m)
  {
      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
      pc_i440fx_machine_options(m);

hw/i386/pc_piix.c static void pc_i440fx_7_2_machine_options(MachineClass *m) · line 444

Quoted 1 line
hw/i386/pc_piix.c +0 -0
@@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
      pcmc->default_cpu_version = 1;

Instead of renaming pc_i440fx_7_2_machine_options() and introducing a new pc_i440fx_7_2_machine_options() below, what about moving pcmc->default_cpu_version = 1 into pc_i440fx_machine_options() instead, like it is done with all other options? Then you could introduce a completely new pc_i440fx_8_0_machine_options() which would be way more logical (also when looking at this file with "git blame" later).

Quoted 31 lines
hw/i386/pc_piix.c +12 -0
  }
 
+DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
+                      pc_i440fx_8_0_machine_options);
+
+static void pc_i440fx_7_2_machine_options(MachineClass *m)
+{
+    pc_i440fx_8_0_machine_options(m);
+    m->alias = NULL;
+    m->is_default = false;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
  DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
                        pc_i440fx_7_2_machine_options);
 
hw/i386/pc_q35.c +1 -1
index a496bd6e74f5..10bb49f679b0 100644
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m)
      m->max_cpus = 288;
  }
 
-static void pc_q35_7_2_machine_options(MachineClass *m)
+static void pc_q35_8_0_machine_options(MachineClass *m)
  {
      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
      pc_q35_machine_options(m);

hw/i386/pc_q35.c static void pc_q35_7_2_machine_options(MachineClass *m) · line 378

Quoted 1 line
hw/i386/pc_q35.c +0 -0
@@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
      pcmc->default_cpu_version = 1;

dito

Quoted 6 lines
hw/i386/pc_q35.c +4 -0
  }
 
+DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
+                   pc_q35_8_0_machine_options);
+
+static void pc_q35_7_2_machine_options(MachineClass *m)

hw/i386/pc_q35.c static void pc_q35_7_2_machine_options(MachineClass *m) · line 394

Quoted 10 lines
hw/i386/pc_q35.c +7 -0
+{
+    pc_q35_8_0_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
  DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
                     pc_q35_7_2_machine_options);
 

Would it make sense to remove the m->alias = NULL from the 7.1 and earlier machine types now?

Thomas

#6 lore raw
Quoted 75 lines · Thomas Huth
Quoted 4 lines · Cornelia Huck

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---

...

Quoted 14 lines
hw/i386/pc_piix.c +1 -1
index 0ad0ed160387..1c0a7b83b545 100644
@@ -435,7 +435,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
      machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
  }
 
-static void pc_i440fx_7_2_machine_options(MachineClass *m)
+static void pc_i440fx_8_0_machine_options(MachineClass *m)
  {
      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
      pc_i440fx_machine_options(m);

hw/i386/pc_piix.c static void pc_i440fx_7_2_machine_options(MachineClass *m) · line 444

Quoted 1 line
hw/i386/pc_piix.c +0 -0
@@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
      pcmc->default_cpu_version = 1;

Instead of renaming pc_i440fx_7_2_machine_options() and introducing a new pc_i440fx_7_2_machine_options() below, what about moving pcmc->default_cpu_version = 1 into pc_i440fx_machine_options() instead, like it is done with all other options? Then you could introduce a completely new pc_i440fx_8_0_machine_options() which would be way more logical (also when looking at this file with "git blame" later).

Quoted 31 lines
hw/i386/pc_piix.c +12 -0
  }
 
+DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
+                      pc_i440fx_8_0_machine_options);
+
+static void pc_i440fx_7_2_machine_options(MachineClass *m)
+{
+    pc_i440fx_8_0_machine_options(m);
+    m->alias = NULL;
+    m->is_default = false;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
  DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
                        pc_i440fx_7_2_machine_options);
 
hw/i386/pc_q35.c +1 -1
index a496bd6e74f5..10bb49f679b0 100644
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m)
      m->max_cpus = 288;
  }
 
-static void pc_q35_7_2_machine_options(MachineClass *m)
+static void pc_q35_8_0_machine_options(MachineClass *m)
  {
      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
      pc_q35_machine_options(m);

hw/i386/pc_q35.c static void pc_q35_7_2_machine_options(MachineClass *m) · line 378

Quoted 1 line
hw/i386/pc_q35.c +0 -0
@@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
      pcmc->default_cpu_version = 1;

dito

Quoted 11 lines
hw/i386/pc_q35.c +9 -0
  }
 
+DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
+                   pc_q35_8_0_machine_options);
+
+static void pc_q35_7_2_machine_options(MachineClass *m)
+{
+    pc_q35_8_0_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
Quoted 8 lines

hw/i386/pc_q35.c static void pc_q35_7_2_machine_options(MachineClass *m) · line 394

Quoted 5 lines
hw/i386/pc_q35.c +2 -0
+}
+
  DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
                     pc_q35_7_2_machine_options);
 

Would it make sense to remove the m->alias = NULL from the 7.1 and earlier machine types now?

Hm, all of this is how we've done machine type updates for the last few years :) We can certainly clean up the redundant stuff, but I'd prefer to do that via a separate patch.

#7 lore raw
Quoted 86 lines · Cornelia Huck
Quoted 75 lines · Thomas Huth
Quoted 4 lines · Cornelia Huck

Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.

---

...

Quoted 14 lines
hw/i386/pc_piix.c +1 -1
index 0ad0ed160387..1c0a7b83b545 100644
@@ -435,7 +435,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
       machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
   }
 
-static void pc_i440fx_7_2_machine_options(MachineClass *m)
+static void pc_i440fx_8_0_machine_options(MachineClass *m)
   {
       PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
       pc_i440fx_machine_options(m);

hw/i386/pc_piix.c static void pc_i440fx_7_2_machine_options(MachineClass *m) · line 444

Quoted 1 line
hw/i386/pc_piix.c +0 -0
@@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
       pcmc->default_cpu_version = 1;

Instead of renaming pc_i440fx_7_2_machine_options() and introducing a new pc_i440fx_7_2_machine_options() below, what about moving pcmc->default_cpu_version = 1 into pc_i440fx_machine_options() instead, like it is done with all other options? Then you could introduce a completely new pc_i440fx_8_0_machine_options() which would be way more logical (also when looking at this file with "git blame" later).

Quoted 31 lines
hw/i386/pc_piix.c +12 -0
   }
 
+DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
+                      pc_i440fx_8_0_machine_options);
+
+static void pc_i440fx_7_2_machine_options(MachineClass *m)
+{
+    pc_i440fx_8_0_machine_options(m);
+    m->alias = NULL;
+    m->is_default = false;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
+}
+
   DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
                         pc_i440fx_7_2_machine_options);
 
hw/i386/pc_q35.c +1 -1
index a496bd6e74f5..10bb49f679b0 100644
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m)
       m->max_cpus = 288;
   }
 
-static void pc_q35_7_2_machine_options(MachineClass *m)
+static void pc_q35_8_0_machine_options(MachineClass *m)
   {
       PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
       pc_q35_machine_options(m);

hw/i386/pc_q35.c static void pc_q35_7_2_machine_options(MachineClass *m) · line 378

Quoted 1 line
hw/i386/pc_q35.c +0 -0
@@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
       pcmc->default_cpu_version = 1;

dito

Quoted 11 lines
hw/i386/pc_q35.c +9 -0
   }
 
+DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
+                   pc_q35_8_0_machine_options);
+
+static void pc_q35_7_2_machine_options(MachineClass *m)
+{
+    pc_q35_8_0_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
+    compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
Quoted 8 lines

hw/i386/pc_q35.c static void pc_q35_7_2_machine_options(MachineClass *m) · line 394

Quoted 5 lines
hw/i386/pc_q35.c +2 -0
+}
+
   DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
                      pc_q35_7_2_machine_options);
 

Would it make sense to remove the m->alias = NULL from the 7.1 and earlier machine types now?

Quoted 3 lines

Hm, all of this is how we've done machine type updates for the last few years :) We can certainly clean up the redundant stuff, but I'd prefer to do that via a separate patch.

OK, that's fair. I'll try to come up with a patch or two if nobody beats me to it once the 8.0 development phase starts.

Thomas