* [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine
@ 2017-11-24 15:33 Cornelia Huck
2017-11-24 15:35 ` Christian Borntraeger
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-11-24 15:33 UTC (permalink / raw)
To: qemu-devel, qemu-s390x
Cc: borntraeger, agraf, rth, thuth, david, 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 6a57f94197..a23b8aec9f 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -639,6 +639,9 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_2_11 \
+ HW_COMPAT_2_11
+
#define CCW_COMPAT_2_10 \
HW_COMPAT_2_10
@@ -716,14 +719,26 @@ bool css_migration_enabled(void)
.value = "0",\
},
+static void ccw_machine_2_12_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_2_12_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(2_12, "2.12", true);
+
static void ccw_machine_2_11_instance_options(MachineState *machine)
{
+ ccw_machine_2_12_instance_options(machine);
}
static void ccw_machine_2_11_class_options(MachineClass *mc)
{
+ ccw_machine_2_12_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11);
}
-DEFINE_CCW_MACHINE(2_11, "2.11", true);
+DEFINE_CCW_MACHINE(2_11, "2.11", false);
static void ccw_machine_2_10_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index cf389b4e85..263de973a7 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_2_11 \
+ /* empty */
+
#define HW_COMPAT_2_10 \
{\
.driver = "virtio-mouse-device",\
--
2.13.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine
2017-11-24 15:33 [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine Cornelia Huck
@ 2017-11-24 15:35 ` Christian Borntraeger
2017-11-24 15:37 ` David Hildenbrand
2017-11-27 10:22 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Christian Borntraeger @ 2017-11-24 15:35 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel, qemu-s390x; +Cc: agraf, rth, thuth, david
On 11/24/2017 04:33 PM, Cornelia Huck wrote:
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Just to be ahead of ARM again? ;-)
Acked-by: Christian Borntraeger <borntraeger@de.ibm.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 6a57f94197..a23b8aec9f 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -639,6 +639,9 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_2_11 \
> + HW_COMPAT_2_11
> +
> #define CCW_COMPAT_2_10 \
> HW_COMPAT_2_10
>
> @@ -716,14 +719,26 @@ bool css_migration_enabled(void)
> .value = "0",\
> },
>
> +static void ccw_machine_2_12_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_12_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_12, "2.12", true);
> +
> static void ccw_machine_2_11_instance_options(MachineState *machine)
> {
> + ccw_machine_2_12_instance_options(machine);
> }
>
> static void ccw_machine_2_11_class_options(MachineClass *mc)
> {
> + ccw_machine_2_12_class_options(mc);
> + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11);
> }
> -DEFINE_CCW_MACHINE(2_11, "2.11", true);
> +DEFINE_CCW_MACHINE(2_11, "2.11", false);
>
> static void ccw_machine_2_10_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index cf389b4e85..263de973a7 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_2_11 \
> + /* empty */
> +
> #define HW_COMPAT_2_10 \
> {\
> .driver = "virtio-mouse-device",\
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine
2017-11-24 15:33 [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine Cornelia Huck
2017-11-24 15:35 ` Christian Borntraeger
@ 2017-11-24 15:37 ` David Hildenbrand
2017-11-27 10:22 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: David Hildenbrand @ 2017-11-24 15:37 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel, qemu-s390x; +Cc: borntraeger, agraf, rth, thuth
On 24.11.2017 16:33, 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 6a57f94197..a23b8aec9f 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -639,6 +639,9 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_2_11 \
> + HW_COMPAT_2_11
> +
> #define CCW_COMPAT_2_10 \
> HW_COMPAT_2_10
>
> @@ -716,14 +719,26 @@ bool css_migration_enabled(void)
> .value = "0",\
> },
>
> +static void ccw_machine_2_12_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_12_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_12, "2.12", true);
> +
> static void ccw_machine_2_11_instance_options(MachineState *machine)
> {
> + ccw_machine_2_12_instance_options(machine);
> }
>
> static void ccw_machine_2_11_class_options(MachineClass *mc)
> {
> + ccw_machine_2_12_class_options(mc);
> + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11);
> }
> -DEFINE_CCW_MACHINE(2_11, "2.11", true);
> +DEFINE_CCW_MACHINE(2_11, "2.11", false);
>
> static void ccw_machine_2_10_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index cf389b4e85..263de973a7 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_2_11 \
> + /* empty */
> +
> #define HW_COMPAT_2_10 \
> {\
> .driver = "virtio-mouse-device",\
>
Reviewed-by: David Hildenbrand <david@redhat.com>
Will be helpful for QEMU cpu model changes soon :)
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine
2017-11-24 15:33 [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine Cornelia Huck
2017-11-24 15:35 ` Christian Borntraeger
2017-11-24 15:37 ` David Hildenbrand
@ 2017-11-27 10:22 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-11-27 10:22 UTC (permalink / raw)
To: qemu-devel, qemu-s390x; +Cc: borntraeger, agraf, rth, thuth, david
On Fri, 24 Nov 2017 16:33:44 +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] 4+ messages in thread
end of thread, other threads:[~2017-11-27 10:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-24 15:33 [Qemu-devel] [PATCH for-2.12] s390x: introduce 2.12 compat machine Cornelia Huck
2017-11-24 15:35 ` Christian Borntraeger
2017-11-24 15:37 ` David Hildenbrand
2017-11-27 10:22 ` Cornelia Huck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.