* [Qemu-devel] [PATCH for-4.0] s390x: introduce 4.0 compat machine
@ 2018-11-19 11:05 Cornelia Huck
2018-11-19 14:13 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
2018-11-20 9:57 ` [Qemu-devel] " Cornelia Huck
0 siblings, 2 replies; 3+ messages in thread
From: Cornelia Huck @ 2018-11-19 11:05 UTC (permalink / raw)
To: qemu-s390x
Cc: Christian Borntraeger, Richard Henderson, David Hildenbrand,
qemu-devel, Cornelia Huck
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
include/hw/compat.h | 3 +++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index a0615a8b35..fd9d0b0542 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -651,6 +651,9 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_3_1 \
+ HW_COMPAT_3_1
+
#define CCW_COMPAT_3_0 \
HW_COMPAT_3_0
@@ -742,14 +745,26 @@ bool css_migration_enabled(void)
.value = "0",\
},
+static void ccw_machine_4_0_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_4_0_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(4_0, "4.0", true);
+
static void ccw_machine_3_1_instance_options(MachineState *machine)
{
+ ccw_machine_4_0_instance_options(machine);
}
static void ccw_machine_3_1_class_options(MachineClass *mc)
{
+ ccw_machine_4_0_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_1);
}
-DEFINE_CCW_MACHINE(3_1, "3.1", true);
+DEFINE_CCW_MACHINE(3_1, "3.1", false);
static void ccw_machine_3_0_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 6f4d5fc647..70958328fe 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -1,6 +1,9 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
+#define HW_COMPAT_3_1 \
+ /* empty */
+
#define HW_COMPAT_3_0 \
/* empty */
--
2.17.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [qemu-s390x] [PATCH for-4.0] s390x: introduce 4.0 compat machine
2018-11-19 11:05 [Qemu-devel] [PATCH for-4.0] s390x: introduce 4.0 compat machine Cornelia Huck
@ 2018-11-19 14:13 ` David Hildenbrand
2018-11-20 9:57 ` [Qemu-devel] " Cornelia Huck
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2018-11-19 14:13 UTC (permalink / raw)
To: Cornelia Huck, qemu-s390x
Cc: Christian Borntraeger, qemu-devel, Richard Henderson
On 19.11.18 12:05, Cornelia Huck wrote:
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
> include/hw/compat.h | 3 +++
> 2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index a0615a8b35..fd9d0b0542 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -651,6 +651,9 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_3_1 \
> + HW_COMPAT_3_1
> +
> #define CCW_COMPAT_3_0 \
> HW_COMPAT_3_0
>
> @@ -742,14 +745,26 @@ bool css_migration_enabled(void)
> .value = "0",\
> },
>
> +static void ccw_machine_4_0_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_4_0_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(4_0, "4.0", true);
> +
> static void ccw_machine_3_1_instance_options(MachineState *machine)
> {
> + ccw_machine_4_0_instance_options(machine);
> }
>
> static void ccw_machine_3_1_class_options(MachineClass *mc)
> {
> + ccw_machine_4_0_class_options(mc);
> + SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_1);
> }
> -DEFINE_CCW_MACHINE(3_1, "3.1", true);
> +DEFINE_CCW_MACHINE(3_1, "3.1", false);
>
> static void ccw_machine_3_0_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 6f4d5fc647..70958328fe 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
> #ifndef HW_COMPAT_H
> #define HW_COMPAT_H
>
> +#define HW_COMPAT_3_1 \
> + /* empty */
> +
> #define HW_COMPAT_3_0 \
> /* empty */
>
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.0] s390x: introduce 4.0 compat machine
2018-11-19 11:05 [Qemu-devel] [PATCH for-4.0] s390x: introduce 4.0 compat machine Cornelia Huck
2018-11-19 14:13 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
@ 2018-11-20 9:57 ` Cornelia Huck
1 sibling, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2018-11-20 9:57 UTC (permalink / raw)
To: qemu-s390x
Cc: Christian Borntraeger, Richard Henderson, David Hildenbrand,
qemu-devel
On Mon, 19 Nov 2018 12:05:48 +0100
Cornelia Huck <cohuck@redhat.com> wrote:
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
> include/hw/compat.h | 3 +++
> 2 files changed, 19 insertions(+), 1 deletion(-)
Queued to s390-next.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-20 9:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-19 11:05 [Qemu-devel] [PATCH for-4.0] s390x: introduce 4.0 compat machine Cornelia Huck
2018-11-19 14:13 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
2018-11-20 9:57 ` [Qemu-devel] " Cornelia Huck
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).