From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTU-0008Bs-Ru for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwvTT-0003Y2-OR for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:32 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 10 Jul 2013 16:33:38 +0200 Message-Id: <1373466860-32732-2-git-send-email-afaerber@suse.de> In-Reply-To: <1373466860-32732-1-git-send-email-afaerber@suse.de> References: <1373466860-32732-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/43] target-openrisc: Fix typename in openrisc_cpu_class_by_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jia Liu , Dongxue Zhang , qemu-stable@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Dongxue Zhang Commit 478032a93d908e59085c1ac56f10979942e7dc4f (target-openrisc: Rename CPU subtypes) suffixed CPU sub-types with "-or32-cpu" but forgot to update openrisc_cpu_class_by_name(), so that it was still looking for the types without suffix. Make target-openrisc running OK by adding the suffix to the model name. This means it is no longer possible to use -cpu or1200-or32-cpu or -cpu any-or32-cpu though. Cc: qemu-stable@nongnu.org Signed-off-by: Dongxue Zhang Tested-by: Jia Liu Signed-off-by: Andreas F=C3=A4rber --- target-openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c index fd90d37..d38c28b 100644 --- a/target-openrisc/cpu.c +++ b/target-openrisc/cpu.c @@ -96,12 +96,14 @@ static void openrisc_cpu_initfn(Object *obj) static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; + char *typename; =20 if (cpu_model =3D=3D NULL) { return NULL; } =20 - oc =3D object_class_by_name(cpu_model); + typename =3D g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model); + oc =3D object_class_by_name(typename); if (oc !=3D NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CP= U) || object_class_is_abstract(oc))) { return NULL; --=20 1.8.1.4