* [Qemu-devel] [PATCH for-3.1] s390x: introduce 3.1 compat machine
@ 2018-07-23 13:10 Cornelia Huck
2018-07-24 11:34 ` David Hildenbrand
2018-07-25 14:36 ` Cornelia Huck
0 siblings, 2 replies; 3+ messages in thread
From: Cornelia Huck @ 2018-07-23 13:10 UTC (permalink / raw)
To: qemu-s390x
Cc: Christian Borntraeger, Alexander Graf, Richard Henderson,
David Hildenbrand, Thomas Huth, 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 7983185d04..d366909474 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -673,6 +673,9 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_3_0 \
+ HW_COMPAT_3_0
+
#define CCW_COMPAT_2_12 \
HW_COMPAT_2_12
@@ -761,14 +764,26 @@ bool css_migration_enabled(void)
.value = "0",\
},
+static void ccw_machine_3_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_3_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(3_1, "3.1", true);
+
static void ccw_machine_3_0_instance_options(MachineState *machine)
{
+ ccw_machine_3_1_instance_options(machine);
}
static void ccw_machine_3_0_class_options(MachineClass *mc)
{
+ ccw_machine_3_1_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_0);
}
-DEFINE_CCW_MACHINE(3_0, "3.0", true);
+DEFINE_CCW_MACHINE(3_0, "3.0", false);
static void ccw_machine_2_12_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index c08f4040bb..6f4d5fc647 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_0 \
+ /* empty */
+
#define HW_COMPAT_2_12 \
{\
.driver = "migration",\
--
2.14.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH for-3.1] s390x: introduce 3.1 compat machine
2018-07-23 13:10 [Qemu-devel] [PATCH for-3.1] s390x: introduce 3.1 compat machine Cornelia Huck
@ 2018-07-24 11:34 ` David Hildenbrand
2018-07-25 14:36 ` Cornelia Huck
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2018-07-24 11:34 UTC (permalink / raw)
To: Cornelia Huck, qemu-s390x
Cc: Christian Borntraeger, Alexander Graf, Richard Henderson,
Thomas Huth, qemu-devel
On 23.07.2018 15:10, 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 7983185d04..d366909474 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -673,6 +673,9 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_3_0 \
> + HW_COMPAT_3_0
> +
> #define CCW_COMPAT_2_12 \
> HW_COMPAT_2_12
>
> @@ -761,14 +764,26 @@ bool css_migration_enabled(void)
> .value = "0",\
> },
>
> +static void ccw_machine_3_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_3_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(3_1, "3.1", true);
> +
> static void ccw_machine_3_0_instance_options(MachineState *machine)
> {
> + ccw_machine_3_1_instance_options(machine);
> }
>
> static void ccw_machine_3_0_class_options(MachineClass *mc)
> {
> + ccw_machine_3_1_class_options(mc);
> + SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_0);
> }
> -DEFINE_CCW_MACHINE(3_0, "3.0", true);
> +DEFINE_CCW_MACHINE(3_0, "3.0", false);
>
> static void ccw_machine_2_12_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index c08f4040bb..6f4d5fc647 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_0 \
> + /* empty */
> +
> #define HW_COMPAT_2_12 \
> {\
> .driver = "migration",\
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH for-3.1] s390x: introduce 3.1 compat machine
2018-07-23 13:10 [Qemu-devel] [PATCH for-3.1] s390x: introduce 3.1 compat machine Cornelia Huck
2018-07-24 11:34 ` David Hildenbrand
@ 2018-07-25 14:36 ` Cornelia Huck
1 sibling, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2018-07-25 14:36 UTC (permalink / raw)
To: qemu-s390x
Cc: Christian Borntraeger, Alexander Graf, Richard Henderson,
David Hildenbrand, Thomas Huth, qemu-devel
On Mon, 23 Jul 2018 15:10:16 +0200
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-07-25 14:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-23 13:10 [Qemu-devel] [PATCH for-3.1] s390x: introduce 3.1 compat machine Cornelia Huck
2018-07-24 11:34 ` David Hildenbrand
2018-07-25 14:36 ` 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).