From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVwQ7-0002Dg-GR for qemu-devel@nongnu.org; Sun, 30 Aug 2015 02:48:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVwQ3-0000Au-HG for qemu-devel@nongnu.org; Sun, 30 Aug 2015 02:48:51 -0400 Date: Sun, 30 Aug 2015 16:45:37 +1000 From: David Gibson Message-ID: <20150830064537.GD11475@voom.redhat.com> References: <1440107676-17326-1-git-send-email-ehabkost@redhat.com> <1440107676-17326-6-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rqzD5py0kzyFAOWN" Content-Disposition: inline In-Reply-To: <1440107676-17326-6-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH 05/10] pseries: Rename machine class names to use MACHINE_TYPE_NAME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Alexander Graf , Marcel Apfelbaum , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Andreas =?iso-8859-1?Q?F=E4rber?= --rqzD5py0kzyFAOWN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 20, 2015 at 02:54:31PM -0700, Eduardo Habkost wrote: > Machine class names should use the "-machine" suffix to allow > class-name-based machine class lookup to work. Rename the the pseries > machine classes using the MACHINE_TYPE_NAME macro. >=20 > Cc: Alexander Graf > Cc: qemu-ppc@nongnu.org > Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson I'm also happy to take this through by spapr-next tree if that's useful to do. > --- > hw/ppc/spapr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index bf0c64f..012b6ed 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1925,7 +1925,7 @@ static void spapr_machine_2_1_class_init(ObjectClas= s *oc, void *data) > } > =20 > static const TypeInfo spapr_machine_2_1_info =3D { > - .name =3D TYPE_SPAPR_MACHINE "2.1", > + .name =3D MACHINE_TYPE_NAME("pseries-2.1"), > .parent =3D TYPE_SPAPR_MACHINE, > .class_init =3D spapr_machine_2_1_class_init, > .instance_init =3D spapr_machine_2_1_instance_init, > @@ -1945,7 +1945,7 @@ static void spapr_machine_2_2_class_init(ObjectClas= s *oc, void *data) > } > =20 > static const TypeInfo spapr_machine_2_2_info =3D { > - .name =3D TYPE_SPAPR_MACHINE "2.2", > + .name =3D MACHINE_TYPE_NAME("pseries-2.2"), > .parent =3D TYPE_SPAPR_MACHINE, > .class_init =3D spapr_machine_2_2_class_init, > .instance_init =3D spapr_machine_2_2_instance_init, > @@ -1965,7 +1965,7 @@ static void spapr_machine_2_3_class_init(ObjectClas= s *oc, void *data) > } > =20 > static const TypeInfo spapr_machine_2_3_info =3D { > - .name =3D TYPE_SPAPR_MACHINE "2.3", > + .name =3D MACHINE_TYPE_NAME("pseries-2.3"), > .parent =3D TYPE_SPAPR_MACHINE, > .class_init =3D spapr_machine_2_3_class_init, > .instance_init =3D spapr_machine_2_3_instance_init, > @@ -1982,7 +1982,7 @@ static void spapr_machine_2_4_class_init(ObjectClas= s *oc, void *data) > } > =20 > static const TypeInfo spapr_machine_2_4_info =3D { > - .name =3D TYPE_SPAPR_MACHINE "2.4", > + .name =3D MACHINE_TYPE_NAME("pseries-2.4"), > .parent =3D TYPE_SPAPR_MACHINE, > .class_init =3D spapr_machine_2_4_class_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 --rqzD5py0kzyFAOWN Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJV4qaRAAoJEGw4ysog2bOSleEQANrbnl0ZM+LwYgt4P4ZOmlUa pp+97BfCwSEyXf0WhbM8Ty5//xp6+swvdX1dewl7oLx3u9WCbL1GQ0xvh+oGb+oM eYA+dQCuRFOjqOV2DVgvrN8ZfoKlfPelJ5dsu6lW5dRQR0XX48QFhwVMQFWm6/5r 9onCj31gkqwBS4eHaR9DbCk2RUH8XqGiTB9/MtFjPjfdAwifhe0GLg6G1hmcia7K kd2FkapOy8lBmI46EKlZdsqUopjV/yx/8Fs8FRAnb9PhN+BsCFkzO3NOFNj8tXiA Aru1E0P+fDQyQQlYpdEDfPWAGHy7j30+QI/0Ml/Q4lvVRWcnPIXYcLArRueXO8Aj 2vtvfGpPpD/FajlhAyiBPqoQ0nG8+fcHugKzQlVMOwlYbccQxZVATYlRHzhnXNbA gj0dZwWGgGwxWZDzmroUg5mBQn+F61/9wzZxb8U5T9VETVfPHOdxwfXTchSxmq0g s7SmmUJp6X5tf/OTf07E4SoEGMfMRblDAT/HSEvWDmIeMfsV1hIB/eETevyrobnU FxG4510bfROjO5PWM8nVX9O0iqJl1zlhrG5SERC2IlniqlDO2J61kipt6NFpT/2t JF7/L56g0lRTcA8Qaj1imwp/OYVqwIxramQytKYsbU0yGhtEzpfr1pCCLilh8Qwd +PtePW//Cl+yUoUoObER =lvLJ -----END PGP SIGNATURE----- --rqzD5py0kzyFAOWN--