From patchwork Sun Jan 27 22:32:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 216073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 966FD2C0096 for ; Mon, 28 Jan 2013 09:33:22 +1100 (EST) Received: from localhost ([::1]:55874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzamu-0000aY-E6 for incoming@patchwork.ozlabs.org; Sun, 27 Jan 2013 17:33:20 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzaml-0000YA-Uz for qemu-devel@nongnu.org; Sun, 27 Jan 2013 17:33:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tzamk-0001ya-MS for qemu-devel@nongnu.org; Sun, 27 Jan 2013 17:33:11 -0500 Received: from cantor2.suse.de ([195.135.220.15]:34139 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzamk-0001xP-GA; Sun, 27 Jan 2013 17:33:10 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 291B2A50DE; Sun, 27 Jan 2013 23:33:08 +0100 (CET) Message-ID: <5105AB1A.3040802@suse.de> Date: Sun, 27 Jan 2013 23:32:58 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130105 Thunderbird/17.0.2 MIME-Version: 1.0 To: qemu-devel@nongnu.org References: <1358942867-8612-1-git-send-email-afaerber@suse.de> <1358942867-8612-9-git-send-email-afaerber@suse.de> In-Reply-To: <1358942867-8612-9-git-send-email-afaerber@suse.de> X-Enigmail-Version: 1.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Guan Xuetao , qemu-stable@nongnu.org Subject: Re: [Qemu-devel] [PATCH qom-cpu for-1.4 08/14] target-unicore32: Detect attempt to instantiate non-CPU type in cpu_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Am 23.01.2013 13:07, schrieb Andreas Färber: > diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c > index 5359538..7ace68c 100644 > --- a/target-unicore32/helper.c > +++ b/target-unicore32/helper.c > @@ -29,9 +29,11 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model) > { > UniCore32CPU *cpu; > CPUUniCore32State *env; > + ObjectClass *oc; > static int inited = 1; > > - if (object_class_by_name(cpu_model) == NULL) { > + oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model); > + if (oc == NULL) { > return NULL; > } > cpu = UNICORE32_CPU(object_new(cpu_model)); Should be using object_class_get_name(oc) instead of cpu_model: Fixed. Andreas diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index 7ace68c..183b5b3 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -36,7 +36,7 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model) if (oc == NULL) { return NULL; } - cpu = UNICORE32_CPU(object_new(cpu_model)); + cpu = UNICORE32_CPU(object_new(object_class_get_name(oc))); env = &cpu->env; if (inited) {