From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44297)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <borntraeger@de.ibm.com>) id 1ZXmjY-0002hz-58
	for qemu-devel@nongnu.org; Fri, 04 Sep 2015 04:52:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <borntraeger@de.ibm.com>) id 1ZXmjU-0001xB-SS
	for qemu-devel@nongnu.org; Fri, 04 Sep 2015 04:52:32 -0400
Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:37586)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <borntraeger@de.ibm.com>) id 1ZXmjU-0001wh-IA
	for qemu-devel@nongnu.org; Fri, 04 Sep 2015 04:52:28 -0400
Received: from /spool/local
	by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <qemu-devel@nongnu.org> from <borntraeger@de.ibm.com>;
	Fri, 4 Sep 2015 09:52:26 +0100
Received: from b06cxnps4076.portsmouth.uk.ibm.com
	(d06relay13.portsmouth.uk.ibm.com [9.149.109.198])
	by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1FE8F1B08061
	for <qemu-devel@nongnu.org>; Fri,  4 Sep 2015 09:54:00 +0100 (BST)
Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com
	[9.149.37.247])
	by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with
	ESMTP id t848qOPB33882156
	for <qemu-devel@nongnu.org>; Fri, 4 Sep 2015 08:52:24 GMT
Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1])
	by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with
	ESMTP id t848qMji001484
	for <qemu-devel@nongnu.org>; Fri, 4 Sep 2015 02:52:23 -0600
Message-ID: <55E95BC6.4060302@de.ibm.com>
Date: Fri, 04 Sep 2015 10:52:22 +0200
From: Christian Borntraeger <borntraeger@de.ibm.com>
MIME-Version: 1.0
References: <1440107676-17326-1-git-send-email-ehabkost@redhat.com>
	<1440107676-17326-8-git-send-email-ehabkost@redhat.com>
In-Reply-To: <1440107676-17326-8-git-send-email-ehabkost@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 07/10] s390: Rename s390-ccw-virtio-2.4
 class name to use MACHINE_TYPE_NAME
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org, =?windows-1252?Q?Andreas_F=E4rber?= <afaerber@suse.de>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>, Richard Henderson <rth@twiddle.net>, David Gibson <david@gibson.dropbear.id.au>, Alexander Graf <agraf@suse.de>, Marcel Apfelbaum <marcel.a@redhat.com>

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 <agraf@suse.de>
> Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Signed-off-by: Eduardo Habkost <ehabkost@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....