[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 1/9] s390x: add 2.6 compat machine
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH v2 1/9] s390x: add 2.6 compat machine |
Date: |
Fri, 8 Jan 2016 13:22:05 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 |
On 01/07/2016 02:36 PM, Cornelia Huck wrote:
> New qemu version, new machine.
>
> Signed-off-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
> ---
> hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 5a52ff2..8d7d04b 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -297,9 +297,7 @@ static void ccw_machine_2_5_class_init(ObjectClass *oc,
> void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - 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 = {
> @@ -308,11 +306,27 @@ static const TypeInfo ccw_machine_2_5_info = {
> .class_init = ccw_machine_2_5_class_init,
> };
>
> +static void ccw_machine_2_6_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> + mc->alias = "s390-ccw-virtio";
> + mc->desc = "VirtIO-ccw based S390 machine v2.6";
> + mc->is_default = 1;
> +}
> +
> +static const TypeInfo ccw_machine_2_6_info = {
> + .name = MACHINE_TYPE_NAME("s390-ccw-virtio-2.6"),
> + .parent = TYPE_S390_CCW_MACHINE,
> + .class_init = ccw_machine_2_6_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_register_static(&ccw_machine_2_6_info);
> }
>
> type_init(ccw_machine_register_types)
>
- [Qemu-devel] [PATCH v2 4/9] s390x/pci: reject some operations to disabled PCI function, (continued)
- [Qemu-devel] [PATCH v2 4/9] s390x/pci: reject some operations to disabled PCI function, Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 6/9] s390x/virtio: use qemu_check_nic_model(), Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 9/9] s390x/pci: return real state during listing PCI, Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 5/9] s390x/pci: code cleanup, Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 3/9] s390x: remove s390-virtio devices, Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 1/9] s390x: add 2.6 compat machine, Cornelia Huck, 2016/01/07
- Re: [Qemu-devel] [PATCH v2 1/9] s390x: add 2.6 compat machine,
Christian Borntraeger <=
- [Qemu-devel] [PATCH v2 8/9] virtio-ccw: fix sanity check for vector, Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 2/9] s390x: remove s390-virtio machine, Cornelia Huck, 2016/01/07
- [Qemu-devel] [PATCH v2 7/9] s390: Introduce CCW_COMPAT_2_5, Cornelia Huck, 2016/01/07