[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.5 1/8] s390x: add 2.5 compat s390-ccw-virt
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH for-2.5 1/8] s390x: add 2.5 compat s390-ccw-virtio machine |
Date: |
Mon, 20 Jul 2015 15:58:38 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 |
Am 20.07.2015 um 15:49 schrieb Cornelia Huck:
> Reviewed-by: Jason J. Herne <address@hidden>
> Signed-off-by: Cornelia Huck <address@hidden>
for post 2.4
Acked-by: Christian Borntraeger <address@hidden>
> ---
> hw/s390x/s390-virtio-ccw.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 4c51d1a..708763e 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -289,7 +289,6 @@ static void ccw_machine_2_4_class_init(ObjectClass *oc,
> void *data)
> mc->name = "s390-ccw-virtio-2.4";
> mc->alias = "s390-ccw-virtio";
> mc->desc = "VirtIO-ccw based S390 machine v2.4";
> - mc->is_default = 1;
> }
>
> static const TypeInfo ccw_machine_2_4_info = {
> @@ -298,10 +297,27 @@ static const TypeInfo ccw_machine_2_4_info = {
> .class_init = ccw_machine_2_4_class_init,
> };
>
> +static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> + mc->name = "s390-ccw-virtio-2.5";
> + mc->alias = "s390-ccw-virtio";
> + mc->desc = "VirtIO-ccw based S390 machine v2.5";
> + mc->is_default = 1;
> +}
> +
> +static const TypeInfo ccw_machine_2_5_info = {
> + .name = TYPE_S390_CCW_MACHINE "2.5",
> + .parent = TYPE_S390_CCW_MACHINE,
> + .class_init = ccw_machine_2_5_class_init,
> +};
> +
> static void ccw_machine_register_types(void)
> {
> type_register_static(&ccw_machine_info);
> type_register_static(&ccw_machine_2_4_info);
> + type_register_static(&ccw_machine_2_5_info);
> }
>
> type_init(ccw_machine_register_types)
>
[Qemu-devel] [PATCH for-2.5 6/8] s390x: Info skeys sub-command, Cornelia Huck, 2015/07/20
[Qemu-devel] [PATCH for-2.5 8/8] s390x: Disable storage key migration on old machine type, Cornelia Huck, 2015/07/20
[Qemu-devel] [PATCH for-2.5 2/8] s390x: Create QOM device for s390 storage keys, Cornelia Huck, 2015/07/20
[Qemu-devel] [PATCH for-2.5 4/8] s390x: Dump storage keys qmp command, Cornelia Huck, 2015/07/20