From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMa-0008Bg-9k for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMY-0006aF-Uj for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:40330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMY-0006ZW-Nh for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:19 +0200 Message-Id: <1442673810-2679-11-git-send-email-afaerber@suse.de> In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de> References: <1442673810-2679-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 10/21] s390: Rename s390-ccw-virtio-2.4 class name to use MACHINE_TYPE_NAME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Alexander Graf , Christian Borntraeger , Cornelia Huck , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: 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. Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson [AF/ehabkost: Updated for 2.5 machine] Signed-off-by: Andreas F=C3=A4rber --- hw/s390x/s390-virtio-ccw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 0e30c0f..e738b5b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -258,7 +258,7 @@ static void ccw_machine_2_4_class_init(ObjectClass *o= c, void *data) } =20 static const TypeInfo ccw_machine_2_4_info =3D { - .name =3D TYPE_S390_CCW_MACHINE "2.4", + .name =3D MACHINE_TYPE_NAME("s390-ccw-virtio-2.4"), .parent =3D TYPE_S390_CCW_MACHINE, .class_init =3D ccw_machine_2_4_class_init, }; @@ -274,7 +274,7 @@ static void ccw_machine_2_5_class_init(ObjectClass *o= c, void *data) } =20 static const TypeInfo ccw_machine_2_5_info =3D { - .name =3D TYPE_S390_CCW_MACHINE "2.5", + .name =3D MACHINE_TYPE_NAME("s390-ccw-virtio-2.5"), .parent =3D TYPE_S390_CCW_MACHINE, .class_init =3D ccw_machine_2_5_class_init, }; --=20 2.1.4