From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX50F-000702-0k for qemu-devel@nongnu.org; Tue, 09 Aug 2016 07:15:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX50B-0001mJ-NO for qemu-devel@nongnu.org; Tue, 09 Aug 2016 07:15:22 -0400 Received: from 10.mo173.mail-out.ovh.net ([46.105.74.148]:57136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX50B-0001lo-Gj for qemu-devel@nongnu.org; Tue, 09 Aug 2016 07:15:19 -0400 Received: from player157.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id 5CC3D1004E64 for ; Tue, 9 Aug 2016 13:15:18 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 9 Aug 2016 13:15:05 +0200 Message-Id: <1470741305-20799-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2] spar: remove extra type variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: David Gibson , Bharata B Rao , qemu-devel@nongnu.org, Thomas Huth , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= The sPAPR CPU core typename is already available in the upper block. Let's use it and move the check upward also. Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/spapr.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) Index: qemu-dgibson-for-2.8.git/hw/ppc/spapr.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu-dgibson-for-2.8.git.orig/hw/ppc/spapr.c +++ qemu-dgibson-for-2.8.git/hw/ppc/spapr.c @@ -1772,6 +1772,11 @@ static void ppc_spapr_init(MachineState if (mc->query_hotpluggable_cpus) { char *type =3D spapr_get_cpu_core_type(machine->cpu_model); =20 + if (!object_class_by_name(type)) { + error_report("Unable to find sPAPR CPU Core definition"); + exit(1); + } + spapr->cores =3D g_new0(Object *, spapr_max_cores); for (i =3D 0; i < spapr_max_cores; i++) { int core_id =3D i * smp_threads; @@ -1783,15 +1788,7 @@ static void ppc_spapr_init(MachineState qemu_register_reset(spapr_drc_reset, drc); =20 if (i < spapr_cores) { - char *type =3D spapr_get_cpu_core_type(machine->cpu_mode= l); - Object *core; - - if (!object_class_by_name(type)) { - error_report("Unable to find sPAPR CPU Core definiti= on"); - exit(1); - } - - core =3D object_new(type); + Object *core =3D object_new(type); object_property_set_int(core, smp_threads, "nr-threads", &error_fatal); object_property_set_int(core, core_id, CPU_CORE_PROP_COR= E_ID,