From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsZB-0008VY-5I for qemu-devel@nongnu.org; Fri, 04 Sep 2015 11:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXsZ5-0000oa-EU for qemu-devel@nongnu.org; Fri, 04 Sep 2015 11:06:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsZ5-0000oL-AV for qemu-devel@nongnu.org; Fri, 04 Sep 2015 11:06:07 -0400 Date: Fri, 4 Sep 2015 12:06:04 -0300 From: Eduardo Habkost Message-ID: <20150904150604.GA5920@thinpad.lan.raisama.net> 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> <55E9B123.3090807@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <55E9B123.3090807@suse.de> 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: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: Marcel Apfelbaum , qemu-devel@nongnu.org, Alexander Graf , Christian Borntraeger , Cornelia Huck , Richard Henderson , David Gibson On Fri, Sep 04, 2015 at 04:56:35PM +0200, Andreas F=E4rber wrote: > 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(ObjectCl= ass *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. >=20 > If it's just a single line addition I can edit that when applying. Thanks! > Anything else in need of changes? That's the only needed change, unless other machine classes were added since I have submitted this patch. But missing a few classes won't break bisectability, and can be fixed by a follow-up patch if necessary. --=20 Eduardo