From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVwQ4-0002Cm-QZ for qemu-devel@nongnu.org; Sun, 30 Aug 2015 02:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVwQ3-0000Az-HF for qemu-devel@nongnu.org; Sun, 30 Aug 2015 02:48:48 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:56758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVwQ3-0000AV-5J for qemu-devel@nongnu.org; Sun, 30 Aug 2015 02:48:47 -0400 Date: Sun, 30 Aug 2015 16:46:02 +1000 From: David Gibson Message-ID: <20150830064602.GE11475@voom.redhat.com> References: <1440107676-17326-1-git-send-email-ehabkost@redhat.com> <1440107676-17326-7-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="6Vw0j8UKbyX0bfpA" Content-Disposition: inline In-Reply-To: <1440107676-17326-7-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH 06/10] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Alexander Graf , Richard Henderson , Marcel Apfelbaum , qemu-devel@nongnu.org, Andreas =?iso-8859-1?Q?F=E4rber?= --6Vw0j8UKbyX0bfpA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 20, 2015 at 02:54:32PM -0700, Eduardo Habkost wrote: > Machine class names should use the "-machine" suffix to allow > class-name-based machine class lookup to work. Rename the s390-virtio > machine class using the MACHINE_TYPE_NAME macro. >=20 > Cc: Alexander Graf > Cc: Richard Henderson > Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson > --- > hw/s390x/s390-virtio.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c > index 1284e77..43d6ccb 100644 > --- a/hw/s390x/s390-virtio.c > +++ b/hw/s390x/s390-virtio.c > @@ -52,7 +52,8 @@ > =20 > #define MAX_BLK_DEVS 10 > #define ZIPL_FILENAME "s390-zipl.rom" > -#define TYPE_S390_MACHINE "s390-machine" > +#define S390_MACHINE "s390-virtio" > +#define TYPE_S390_MACHINE MACHINE_TYPE_NAME(S390_MACHINE) > =20 > #define S390_TOD_CLOCK_VALUE_MISSING 0x00 > #define S390_TOD_CLOCK_VALUE_PRESENT 0x01 > @@ -333,7 +334,7 @@ static void s390_machine_class_init(ObjectClass *oc, = void *data) > MachineClass *mc =3D MACHINE_CLASS(oc); > NMIClass *nc =3D NMI_CLASS(oc); > =20 > - mc->name =3D "s390-virtio"; > + mc->name =3D S390_MACHINE; > mc->alias =3D "s390"; > mc->desc =3D "VirtIO based S390 machine"; > mc->init =3D s390_init; --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --6Vw0j8UKbyX0bfpA Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJV4qaqAAoJEGw4ysog2bOS38AQAJaj/1noOMLrEfhURPSkRL2M PLzwtvGL1CcbyYhtgyWAyq5bMR48Ai6CCG+qj5YWT2vIcsPebxfHTrUiXSk9ARt/ wBE194tl0igGEBXHyBO08vZV5nTEQzstCzGl3EASVNk/zjHSvloheiEAVnI3kIFn cBrQf30kTuT1wK5JsER+NKsIQGJW1OuhBaKz+uN1PbkLXmAhQnZZ04KOUX2Zejy1 8oQKXLx02DikHAOLaDTd2Ub3h7fsIsgmOeAjy+tO1SIAgI3zjqMI+oaKEzjdTl++ sZ9mN1k4bM+ov+zV7BmwQJTQ6cTXtzmodNbLLMN9NZvYVBEZTU7aqJSC0eIxNk2x S35DcmvGPFtgNMSu1scPMiSGOK1vdD9FkAgvyGib/v+nVU7ZemJgb/qbrFN4lDFv ZB7wiXtDQtjSHNdE0jwDbcKN4kfYMSiLJX06x95iH1eA/MVpWSxVcRhlyCtEeqXA 6Q6XdIKpJijeqUmwLfgsQXaCwl1oozp0SCRW/aPdDYRRdddC6IfoETML9DoMX09/ kudJ82G1YqFrcM6WQlPfaiYr5QQ1fVB0MEAdRO/WLqntrGg7IWeXEMQ9d8n4YGyP DaAqeYuycmetlcn8xqTtz9DRa8XE2TTvwzu0lehnlZzTsvRYrgPDTMKrYxNTQffX P6TXBmMoQdyXLZqlSJHR =/VPD -----END PGP SIGNATURE----- --6Vw0j8UKbyX0bfpA--