From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dl4Pz-0008El-7W for qemu-devel@nongnu.org; Thu, 24 Aug 2017 22:32:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dl4Px-0001Ag-Uf for qemu-devel@nongnu.org; Thu, 24 Aug 2017 22:32:19 -0400 Date: Fri, 25 Aug 2017 11:30:47 +1000 From: David Gibson Message-ID: <20170825013047.GP5379@umbus.fritz.box> References: <1503562911-2776-1-git-send-email-imammedo@redhat.com> <1503562911-2776-2-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AoBLyXwWXtFbU0pZ" Content-Disposition: inline In-Reply-To: <1503562911-2776-2-git-send-email-imammedo@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, Alexander Graf , qemu-ppc@nongnu.org --AoBLyXwWXtFbU0pZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 24, 2017 at 10:21:46AM +0200, Igor Mammedov wrote: > Replace > "-" TYPE_POWERPC_CPU > when composing cpu type name from cpu model string literal > and the same pattern in format strings with > POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model) > macroses like we do in x86. >=20 > Later POWERPC_CPU_TYPE_NAME() will be used to define default > cpu type per machine type and as bonus it will be consistent > and easy grep-able pattern across all other targets that I'm > plannig to treat the same way. >=20 > Signed-off-by: Igor Mammedov Reviewed-by: David Gibson I'm assuming you'll stage this for 2.11. > --- > target/ppc/cpu.h | 3 +++ > target/ppc/kvm_ppc.h | 2 +- > target/ppc/cpu-models.c | 2 +- > target/ppc/kvm.c | 2 +- > target/ppc/translate_init.c | 6 +++--- > 5 files changed, 9 insertions(+), 6 deletions(-) >=20 > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 12f0949..0512393 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, ui= nt32_t val); > =20 > #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model) > =20 > +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU > +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX > + > #define cpu_signal_handler cpu_ppc_signal_handler > #define cpu_list ppc_cpu_list > =20 > diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h > index 6bc6fb3..bcb40f2 100644 > --- a/target/ppc/kvm_ppc.h > +++ b/target/ppc/kvm_ppc.h > @@ -9,7 +9,7 @@ > #ifndef KVM_PPC_H > #define KVM_PPC_H > =20 > -#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU > +#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host") > =20 > #ifdef CONFIG_KVM > =20 > diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c > index 4d3e635..8b27962 100644 > --- a/target/ppc/cpu-models.c > +++ b/target/ppc/cpu-models.c > @@ -51,7 +51,7 @@ > = \ > static const TypeInfo = \ > glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) =3D { = \ > - .name =3D _name "-" TYPE_POWERPC_CPU, = \ > + .name =3D POWERPC_CPU_TYPE_NAME(_name), = \ > .parent =3D stringify(_type) "-family-" TYPE_POWERPC_CPU, = \ > .class_init =3D = \ > glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init)= , \ > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 8571379..8590809 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -2484,7 +2484,7 @@ static int kvm_ppc_register_host_cpu_type(void) > char *suffix; > =20 > ppc_cpu_aliases[i].model =3D g_strdup(object_class_get_name(= oc)); > - suffix =3D strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_= CPU); > + suffix =3D strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE= _SUFFIX); > if (suffix) { > *suffix =3D 0; > } > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c > index 43be9a8..f377cf2 100644 > --- a/target/ppc/translate_init.c > +++ b/target/ppc/translate_init.c > @@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpoin= ter a, gconstpointer b) > if (strncasecmp(name, object_class_get_name(oc), strlen(name)) =3D= =3D 0 && > ppc_cpu_is_valid(pcc) && > strcmp(object_class_get_name(oc) + strlen(name), > - "-" TYPE_POWERPC_CPU) =3D=3D 0) { > + POWERPC_CPU_TYPE_SUFFIX) =3D=3D 0) { > return 0; > } > return -1; > @@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpo= inter user_data) > } > =20 > name =3D g_strndup(typename, > - strlen(typename) - strlen("-" TYPE_POWERPC_CPU)); > + strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX)); > (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n", > name, pcc->pvr); > for (i =3D 0; ppc_cpu_aliases[i].alias !=3D NULL; i++) { > @@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpo= inter user_data) > typename =3D object_class_get_name(oc); > info =3D g_malloc0(sizeof(*info)); > info->name =3D g_strndup(typename, > - strlen(typename) - strlen("-" TYPE_POWERPC_CP= U)); > + strlen(typename) - strlen(POWERPC_CPU_TYPE_SU= FFIX)); > =20 > entry =3D g_malloc0(sizeof(*entry)); > entry->value =3D info; --=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 --AoBLyXwWXtFbU0pZ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlmffcUACgkQbDjKyiDZ s5L5fw/+PKDXctUGyKVq8hc0kwXmW+E1BPfS4dPWP5gfgGgc0oG7QLeTR63/RFRM qPTE+q5vxoScqIJzWRVkIaXuVyGeMmMvbK1ft/wt45/kL+bI4F5KvHLUzaLcfkTL x3bKdJAEwuGPwQFSVkd0HXdXdrcUvNFBR8L96+3P+d6wGNdhHiJL1eLP5236r95U tfvpPLqpjyxJPQuLjOOxyQYaPdHw4aBmgQO4E8SHOBIPkGc5xx9nXpTSz8l+dvbw gSAeLJCff4GqOVL2Z90uxg84haqQOi8Jx9BxVpkHmubys7gYqecNqHwOgaOAyYJV o9aUOepvNUEHk97I9PxD7u4RTRLpm7ehSOS9vd6mBloE1c0edBm/EP815R5iUq40 PyAsTkd7FErj3f2oMlpWSghJIM0wuMfyGwu3grCMXF2q5HKrJbhpcwDOxmGjN/F4 pVcEvp0grEiOnXQMFPV0D+VOOE2KND/CKfOvQ26MeTibTu6O4iUMFq6qFjiNBtMu 3zClNF8US77JRyI1eKwBOq5V3AXpQolHMdSWN8jOR2kIq8hEisJ3eoyEoJbCG6NN XCIIUdwe/gPW6PXpGY+axFAKduO5Qb7MCCy9wbCOmTPIWO56Fgm1nmJMn1pu9oH3 9r8kpfSZaM+79EHraupBuAPKXwQLxSH+6lyobCn5CmfclXEtx5c= =IBzA -----END PGP SIGNATURE----- --AoBLyXwWXtFbU0pZ--