* [Qemu-devel] [PATCH] s390: Introduce CCW_COMPAT_2_5
@ 2015-12-23 19:42 Shmulik Ladkani
2016-01-07 13:30 ` Cornelia Huck
0 siblings, 1 reply; 2+ messages in thread
From: Shmulik Ladkani @ 2015-12-23 19:42 UTC (permalink / raw)
To: Cornelia Huck
Cc: Shmulik Ladkani, idan.brown, Alexander Graf, Eduardo Habkost,
qemu-devel
In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and
PC_COMPAT_2_5 were introduced.
Accordingly, introduce CCW_COMPAT_2_5 that uses HW_COMPAT_2_5.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
---
hw/s390x/s390-virtio-ccw.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5a52ff2..3d79654 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -235,7 +235,11 @@ static const TypeInfo ccw_machine_info = {
},
};
+#define CCW_COMPAT_2_5 \
+ HW_COMPAT_2_5
+
#define CCW_COMPAT_2_4 \
+ CCW_COMPAT_2_5 \
HW_COMPAT_2_4 \
{\
.driver = TYPE_S390_SKEYS,\
@@ -296,10 +300,15 @@ static const TypeInfo ccw_machine_2_4_info = {
static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ static GlobalProperty compat_props[] = {
+ CCW_COMPAT_2_5
+ { /* end of list */ }
+ };
mc->alias = "s390-ccw-virtio";
mc->desc = "VirtIO-ccw based S390 machine v2.5";
mc->is_default = 1;
+ mc->compat_props = compat_props;
}
static const TypeInfo ccw_machine_2_5_info = {
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] s390: Introduce CCW_COMPAT_2_5
2015-12-23 19:42 [Qemu-devel] [PATCH] s390: Introduce CCW_COMPAT_2_5 Shmulik Ladkani
@ 2016-01-07 13:30 ` Cornelia Huck
0 siblings, 0 replies; 2+ messages in thread
From: Cornelia Huck @ 2016-01-07 13:30 UTC (permalink / raw)
To: Shmulik Ladkani; +Cc: idan.brown, Alexander Graf, Eduardo Habkost, qemu-devel
On Wed, 23 Dec 2015 21:42:11 +0200
Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> wrote:
> In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and
> PC_COMPAT_2_5 were introduced.
>
> Accordingly, introduce CCW_COMPAT_2_5 that uses HW_COMPAT_2_5.
>
> Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
> ---
> hw/s390x/s390-virtio-ccw.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
Thanks, applied to my s390-next branch (after fixing up a trivial
conflict).
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-07 13:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-23 19:42 [Qemu-devel] [PATCH] s390: Introduce CCW_COMPAT_2_5 Shmulik Ladkani
2016-01-07 13:30 ` 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).