From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsPx-00014M-WE for qemu-devel@nongnu.org; Fri, 04 Sep 2015 10:56:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXsPu-0003PV-0Y for qemu-devel@nongnu.org; Fri, 04 Sep 2015 10:56:41 -0400 Received: from mx2.suse.de ([195.135.220.15]:35885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsPt-0003PE-R2 for qemu-devel@nongnu.org; Fri, 04 Sep 2015 10:56:37 -0400 References: <1440107676-17326-1-git-send-email-ehabkost@redhat.com> <1440107676-17326-8-git-send-email-ehabkost@redhat.com> <55E95BC6.4060302@de.ibm.com> <20150904145418.GA3574@thinpad.lan.raisama.net> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <55E9B123.3090807@suse.de> Date: Fri, 4 Sep 2015 16:56:35 +0200 MIME-Version: 1.0 In-Reply-To: <20150904145418.GA3574@thinpad.lan.raisama.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 07/10] 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: Eduardo Habkost , Christian Borntraeger Cc: Marcel Apfelbaum , Alexander Graf , qemu-devel@nongnu.org, Cornelia Huck , David Gibson , Richard Henderson 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 >>> Cc: Cornelia Huck >>> Cc: Christian Borntraeger >>> Cc: Richard Henderson >>> Signed-off-by: Eduardo Habkost >>> --- >>> 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(ObjectClas= s *oc, void *data) >>> } >>> >>> 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, >>> }; >>> >> >> Since yesterday you also need to adopt the 2.5 machine.... >=20 > 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 --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Graham Norton; HRB 21284 (AG N=FC= rnberg)