* [PATCH for-9.0] hw: Add compat machines for 9.0
@ 2023-11-20 9:42 Cornelia Huck
2023-11-20 11:03 ` Thomas Huth
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Cornelia Huck @ 2023-11-20 9:42 UTC (permalink / raw)
To: Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé, Yanan Wang, Michael S. Tsirkin,
Paolo Bonzini, Richard Henderson, Laurent Vivier, Nicholas Piggin,
Daniel Henrique Barboza, Cédric Le Goater, David Gibson,
Harsh Prateek Bora, David Hildenbrand, Ilya Leoshkevich,
Thomas Huth, Halil Pasic, Christian Borntraeger, Eric Farman
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x, Cornelia Huck
Add 9.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/arm/virt.c | 9 ++++++++-
hw/core/machine.c | 3 +++
hw/i386/pc.c | 3 +++
hw/i386/pc_piix.c | 17 ++++++++++++++---
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, 80 insertions(+), 9 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index be2856c018aa..efd503d45e48 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3180,10 +3180,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_9_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(9, 0)
+
static void virt_machine_8_2_options(MachineClass *mc)
{
+ virt_machine_9_0_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_8_2, hw_compat_8_2_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(8, 2)
+DEFINE_VIRT_MACHINE(8, 2)
static void virt_machine_8_1_options(MachineClass *mc)
{
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 0c1739814124..2699bcba5357 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -32,6 +32,9 @@
#include "hw/virtio/virtio-net.h"
#include "audio/audio.h"
+GlobalProperty hw_compat_8_2[] = {};
+const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2);
+
GlobalProperty hw_compat_8_1[] = {
{ TYPE_PCI_BRIDGE, "x-pci-express-writeable-slt-bug", "true" },
{ "ramfb", "x-migrate", "off" },
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 29b9964733ed..496498df3a8f 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -78,6 +78,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_8_2[] = {};
+const size_t pc_compat_8_2_len = G_N_ELEMENTS(pc_compat_8_2);
+
GlobalProperty pc_compat_8_1[] = {};
const size_t pc_compat_8_1_len = G_N_ELEMENTS(pc_compat_8_1);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index eace8543358a..042c13cdbc33 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -545,13 +545,26 @@ static void pc_i440fx_machine_options(MachineClass *m)
"Use a different south bridge than PIIX3");
}
-static void pc_i440fx_8_2_machine_options(MachineClass *m)
+static void pc_i440fx_9_0_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = true;
}
+DEFINE_I440FX_MACHINE(v9_0, "pc-i440fx-9.0", NULL,
+ pc_i440fx_9_0_machine_options);
+
+static void pc_i440fx_8_2_machine_options(MachineClass *m)
+{
+ pc_i440fx_9_0_machine_options(m);
+ m->alias = NULL;
+ m->is_default = false;
+
+ compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
+ compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
+}
+
DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL,
pc_i440fx_8_2_machine_options);
@@ -560,8 +573,6 @@ static void pc_i440fx_8_1_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_8_2_machine_options(m);
- m->alias = NULL;
- m->is_default = false;
pcmc->broken_32bit_mem_addr_check = true;
compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 4f3e5412f6b8..f43d5142b8e5 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -383,12 +383,23 @@ static void pc_q35_machine_options(MachineClass *m)
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
}
-static void pc_q35_8_2_machine_options(MachineClass *m)
+static void pc_q35_9_0_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
m->alias = "q35";
}
+DEFINE_Q35_MACHINE(v9_0, "pc-q35-9.0", NULL,
+ pc_q35_9_0_machine_options);
+
+static void pc_q35_8_2_machine_options(MachineClass *m)
+{
+ pc_q35_9_0_machine_options(m);
+ m->alias = NULL;
+ compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
+ compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
+}
+
DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL,
pc_q35_8_2_machine_options);
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 2e49e262ee0e..e2792ef46d93 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -346,10 +346,17 @@ type_init(virt_machine_register_types)
} \
type_init(machvirt_machine_##major##_##minor##_init);
+static void virt_machine_9_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(9, 0, true)
+
static void virt_machine_8_2_options(MachineClass *mc)
{
+ virt_machine_9_0_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_8_2, hw_compat_8_2_len);
}
-DEFINE_VIRT_MACHINE(8, 2, true)
+DEFINE_VIRT_MACHINE(8, 2, false)
static void virt_machine_8_1_options(MachineClass *mc)
{
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index df09aa9d6a00..9b6c1c129f25 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4785,15 +4785,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
} \
type_init(spapr_machine_register_##suffix)
+/*
+ * pseries-9.0
+ */
+static void spapr_machine_9_0_class_options(MachineClass *mc)
+{
+ /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(9_0, "9.0", true);
+
/*
* pseries-8.2
*/
static void spapr_machine_8_2_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
+ spapr_machine_9_0_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_8_2, hw_compat_8_2_len);
}
-DEFINE_SPAPR_MACHINE(8_2, "8.2", true);
+DEFINE_SPAPR_MACHINE(8_2, "8.2", false);
/*
* pseries-8.1
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7262725d2e8a..1169e20b94fe 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -855,14 +855,26 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+static void ccw_machine_9_0_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_9_0_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(9_0, "9.0", true);
+
static void ccw_machine_8_2_instance_options(MachineState *machine)
{
+ ccw_machine_9_0_instance_options(machine);
}
static void ccw_machine_8_2_class_options(MachineClass *mc)
{
+ ccw_machine_9_0_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_8_2, hw_compat_8_2_len);
}
-DEFINE_CCW_MACHINE(8_2, "8.2", true);
+DEFINE_CCW_MACHINE(8_2, "8.2", false);
static void ccw_machine_8_1_instance_options(MachineState *machine)
{
diff --git a/include/hw/boards.h b/include/hw/boards.h
index a7359992980a..bda3c91efa5b 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -419,6 +419,9 @@ struct MachineState {
} \
type_init(machine_initfn##_register_types)
+extern GlobalProperty hw_compat_8_2[];
+extern const size_t hw_compat_8_2_len;
+
extern GlobalProperty hw_compat_8_1[];
extern const size_t hw_compat_8_1_len;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index a10ceeabbfac..916af29f7c0d 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -210,6 +210,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
/* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms);
+extern GlobalProperty pc_compat_8_2[];
+extern const size_t pc_compat_8_2_len;
+
extern GlobalProperty pc_compat_8_1[];
extern const size_t pc_compat_8_1_len;
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH for-9.0] hw: Add compat machines for 9.0
2023-11-20 9:42 [PATCH for-9.0] hw: Add compat machines for 9.0 Cornelia Huck
@ 2023-11-20 11:03 ` Thomas Huth
2023-11-21 4:50 ` Harsh Prateek Bora
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2023-11-20 11:03 UTC (permalink / raw)
To: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé, Yanan Wang, Michael S. Tsirkin,
Paolo Bonzini, Richard Henderson, Laurent Vivier, Nicholas Piggin,
Daniel Henrique Barboza, Cédric Le Goater, David Gibson,
Harsh Prateek Bora, David Hildenbrand, Ilya Leoshkevich,
Halil Pasic, Christian Borntraeger, Eric Farman
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
On 20/11/2023 10.42, Cornelia Huck wrote:
> Add 9.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 17 ++++++++++++++---
> 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, 80 insertions(+), 9 deletions(-)
For s390x part:
Acked-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH for-9.0] hw: Add compat machines for 9.0
2023-11-20 9:42 [PATCH for-9.0] hw: Add compat machines for 9.0 Cornelia Huck
2023-11-20 11:03 ` Thomas Huth
@ 2023-11-21 4:50 ` Harsh Prateek Bora
2023-11-21 23:27 ` Gavin Shan
2023-11-27 16:57 ` Eric Farman
3 siblings, 0 replies; 5+ messages in thread
From: Harsh Prateek Bora @ 2023-11-21 4:50 UTC (permalink / raw)
To: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé, Yanan Wang, Michael S. Tsirkin,
Paolo Bonzini, Richard Henderson, Laurent Vivier, Nicholas Piggin,
Daniel Henrique Barboza, Cédric Le Goater, David Gibson,
David Hildenbrand, Ilya Leoshkevich, Thomas Huth, Halil Pasic,
Christian Borntraeger, Eric Farman
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
On 11/20/23 15:12, Cornelia Huck wrote:
> Add 9.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck<cohuck@redhat.com>
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 17 ++++++++++++++---
> 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, 80 insertions(+), 9 deletions(-)
For spapr:
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH for-9.0] hw: Add compat machines for 9.0
2023-11-20 9:42 [PATCH for-9.0] hw: Add compat machines for 9.0 Cornelia Huck
2023-11-20 11:03 ` Thomas Huth
2023-11-21 4:50 ` Harsh Prateek Bora
@ 2023-11-21 23:27 ` Gavin Shan
2023-11-27 16:57 ` Eric Farman
3 siblings, 0 replies; 5+ messages in thread
From: Gavin Shan @ 2023-11-21 23:27 UTC (permalink / raw)
To: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé, Yanan Wang, Michael S. Tsirkin,
Paolo Bonzini, Richard Henderson, Laurent Vivier, Nicholas Piggin,
Daniel Henrique Barboza, Cédric Le Goater, David Gibson,
Harsh Prateek Bora, David Hildenbrand, Ilya Leoshkevich,
Thomas Huth, Halil Pasic, Christian Borntraeger, Eric Farman
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
On 11/20/23 19:42, Cornelia Huck wrote:
> Add 9.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 17 ++++++++++++++---
> 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, 80 insertions(+), 9 deletions(-)
>
For hw/arm/virt.c
Reviewed-by: Gavin Shan <gshan@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH for-9.0] hw: Add compat machines for 9.0
2023-11-20 9:42 [PATCH for-9.0] hw: Add compat machines for 9.0 Cornelia Huck
` (2 preceding siblings ...)
2023-11-21 23:27 ` Gavin Shan
@ 2023-11-27 16:57 ` Eric Farman
3 siblings, 0 replies; 5+ messages in thread
From: Eric Farman @ 2023-11-27 16:57 UTC (permalink / raw)
To: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé, Yanan Wang, Michael S. Tsirkin,
Paolo Bonzini, Richard Henderson, Laurent Vivier, Nicholas Piggin,
Daniel Henrique Barboza, Cédric Le Goater, David Gibson,
Harsh Prateek Bora, David Hildenbrand, Ilya Leoshkevich,
Thomas Huth, Halil Pasic, Christian Borntraeger
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
On Mon, 2023-11-20 at 10:42 +0100, Cornelia Huck wrote:
> Add 9.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 17 ++++++++++++++---
> 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, 80 insertions(+), 9 deletions(-)
Acked-by: Eric Farman <farman@linux.ibm.com> # s390x
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-27 16:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20 9:42 [PATCH for-9.0] hw: Add compat machines for 9.0 Cornelia Huck
2023-11-20 11:03 ` Thomas Huth
2023-11-21 4:50 ` Harsh Prateek Bora
2023-11-21 23:27 ` Gavin Shan
2023-11-27 16:57 ` Eric Farman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).