* [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine
@ 2017-08-10 12:37 Cornelia Huck
2017-08-10 13:07 ` David Hildenbrand
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-08-10 12:37 UTC (permalink / raw)
To: qemu-devel; +Cc: borntraeger, agraf, rth, thuth, david, Cornelia Huck
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
It's that time again. I plan to put this into my first 2.11 pullreq.
Yes, and I assume that the next version is indeed 2.11 :)
---
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 1c7af39ce6..d3d67b8d77 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -432,6 +432,9 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_2_10 \
+ HW_COMPAT_2_10
+
#define CCW_COMPAT_2_9 \
HW_COMPAT_2_9 \
{\
@@ -506,8 +509,18 @@ bool css_migration_enabled(void)
.value = "0",\
},
+static void ccw_machine_2_11_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_2_11_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(2_11, "2.11", true);
+
static void ccw_machine_2_10_instance_options(MachineState *machine)
{
+ ccw_machine_2_11_instance_options(machine);
if (css_migration_enabled()) {
css_register_vmstate();
}
@@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
static void ccw_machine_2_10_class_options(MachineClass *mc)
{
+ ccw_machine_2_11_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
}
-DEFINE_CCW_MACHINE(2_10, "2.10", true);
+DEFINE_CCW_MACHINE(2_10, "2.10", false);
static void ccw_machine_2_9_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 08f36004da..3e101f8f67 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_10 \
+ /* empty */
+
#define HW_COMPAT_2_9 \
{\
.driver = "pci-bridge",\
--
2.13.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine
2017-08-10 12:37 [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine Cornelia Huck
@ 2017-08-10 13:07 ` David Hildenbrand
2017-08-11 11:29 ` Halil Pasic
2017-08-11 14:29 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: David Hildenbrand @ 2017-08-10 13:07 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel; +Cc: borntraeger, agraf, rth, thuth
On 10.08.2017 14:37, Cornelia Huck wrote:
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
>
> It's that time again. I plan to put this into my first 2.11 pullreq.
> Yes, and I assume that the next version is indeed 2.11 :)
>
> ---
> 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 1c7af39ce6..d3d67b8d77 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -432,6 +432,9 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_2_10 \
> + HW_COMPAT_2_10
> +
> #define CCW_COMPAT_2_9 \
> HW_COMPAT_2_9 \
> {\
> @@ -506,8 +509,18 @@ bool css_migration_enabled(void)
> .value = "0",\
> },
>
> +static void ccw_machine_2_11_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_11_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_11, "2.11", true);
> +
> static void ccw_machine_2_10_instance_options(MachineState *machine)
> {
> + ccw_machine_2_11_instance_options(machine);
> if (css_migration_enabled()) {
> css_register_vmstate();
> }
> @@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
>
> static void ccw_machine_2_10_class_options(MachineClass *mc)
> {
> + ccw_machine_2_11_class_options(mc);
> + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
> }
> -DEFINE_CCW_MACHINE(2_10, "2.10", true);
> +DEFINE_CCW_MACHINE(2_10, "2.10", false);
>
> static void ccw_machine_2_9_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 08f36004da..3e101f8f67 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_10 \
> + /* empty */
> +
> #define HW_COMPAT_2_9 \
> {\
> .driver = "pci-bridge",\
>
Looks just fine to me.
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine
2017-08-10 12:37 [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine Cornelia Huck
2017-08-10 13:07 ` David Hildenbrand
@ 2017-08-11 11:29 ` Halil Pasic
2017-08-11 14:29 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Halil Pasic @ 2017-08-11 11:29 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel; +Cc: thuth, david, agraf, borntraeger, rth
;
On 08/10/2017 02:37 PM, Cornelia Huck wrote:
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
>
> It's that time again. I plan to put this into my first 2.11 pullreq.
> Yes, and I assume that the next version is indeed 2.11 :)
>
> ---
> 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 1c7af39ce6..d3d67b8d77 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -432,6 +432,9 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_2_10 \
> + HW_COMPAT_2_10
> +
> #define CCW_COMPAT_2_9 \
> HW_COMPAT_2_9 \
> {\
> @@ -506,8 +509,18 @@ bool css_migration_enabled(void)
> .value = "0",\
> },
>
> +static void ccw_machine_2_11_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_11_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_11, "2.11", true);
> +
> static void ccw_machine_2_10_instance_options(MachineState *machine)
> {
> + ccw_machine_2_11_instance_options(machine);
> if (css_migration_enabled()) {
> css_register_vmstate();
> }
> @@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
>
> static void ccw_machine_2_10_class_options(MachineClass *mc)
> {
> + ccw_machine_2_11_class_options(mc);
> + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
> }
> -DEFINE_CCW_MACHINE(2_10, "2.10", true);
> +DEFINE_CCW_MACHINE(2_10, "2.10", false);
>
> static void ccw_machine_2_9_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 08f36004da..3e101f8f67 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_10 \
> + /* empty */
> +
> #define HW_COMPAT_2_9 \
> {\
> .driver = "pci-bridge",\
>
LGTM
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine
2017-08-10 12:37 [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine Cornelia Huck
2017-08-10 13:07 ` David Hildenbrand
2017-08-11 11:29 ` Halil Pasic
@ 2017-08-11 14:29 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-08-11 14:29 UTC (permalink / raw)
To: qemu-devel; +Cc: borntraeger, agraf, rth, thuth, david
On Thu, 10 Aug 2017 14:37:41 +0200
Cornelia Huck <cohuck@redhat.com> wrote:
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
>
> It's that time again. I plan to put this into my first 2.11 pullreq.
> Yes, and I assume that the next version is indeed 2.11 :)
>
> ---
> hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
> include/hw/compat.h | 3 +++
> 2 files changed, 19 insertions(+), 1 deletion(-)
Applied to s390-next.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-11 14:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-10 12:37 [Qemu-devel] [PATCH for-2.11] s390x: introduce 2.11 compat machine Cornelia Huck
2017-08-10 13:07 ` David Hildenbrand
2017-08-11 11:29 ` Halil Pasic
2017-08-11 14:29 ` 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).