Am 04.09.2015 um 16:54 schrieb Eduardo Habkost:
> On Fri, Sep 04, 2015 at 10:52:22AM +0200, Christian Borntraeger wrote:
>> Am 20.08.2015 um 23:54 schrieb Eduardo Habkost:
>>> Machine class names should use the "-machine" suffix to allow
>>> class-name-based machine class lookup to work. Rename the
>>> s390-ccw-virtio-2.4 machine class using the MACHINE_TYPE_NAME macro.
>>>
>>> Cc: Alexander Graf <ag...@suse.de>
>>> Cc: Cornelia Huck <cornelia.h...@de.ibm.com>
>>> Cc: Christian Borntraeger <borntrae...@de.ibm.com>
>>> Cc: Richard Henderson <r...@twiddle.net>
>>> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
>>> ---
>>> hw/s390x/s390-virtio-ccw.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>>> index 4c51d1a..66e1478 100644
>>> --- a/hw/s390x/s390-virtio-ccw.c
>>> +++ b/hw/s390x/s390-virtio-ccw.c
>>> @@ -293,7 +293,7 @@ static void ccw_machine_2_4_class_init(ObjectClass *oc,
>>> void *data)
>>> }
>>>
>>> static const TypeInfo ccw_machine_2_4_info = {
>>> - .name = TYPE_S390_CCW_MACHINE "2.4",
>>> + .name = MACHINE_TYPE_NAME("s390-ccw-virtio-2.4"),
>>> .parent = TYPE_S390_CCW_MACHINE,
>>> .class_init = ccw_machine_2_4_class_init,
>>> };
>>>
>>
>> Since yesterday you also need to adopt the 2.5 machine....
>
> Thanks for for noting! I will rebase and resubmit.
If it's just a single line addition I can edit that when applying.
Anything else in need of changes?
Regards,
Andreas
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)
