From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53719)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <proljc@gmail.com>) id 1Uyuec-0001qx-0n
	for qemu-devel@nongnu.org; Mon, 15 Jul 2013 22:06:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <proljc@gmail.com>) id 1Uyueb-0007gX-7k
	for qemu-devel@nongnu.org; Mon, 15 Jul 2013 22:06:13 -0400
Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:63807)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <proljc@gmail.com>) id 1Uyueb-0007fh-2G
	for qemu-devel@nongnu.org; Mon, 15 Jul 2013 22:06:13 -0400
Received: by mail-we0-f174.google.com with SMTP id q58so100074wes.19
	for <qemu-devel@nongnu.org>; Mon, 15 Jul 2013 19:06:12 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <1373940029-7455-5-git-send-email-proljc@gmail.com>
References: <1373940029-7455-1-git-send-email-proljc@gmail.com>
	<1373940029-7455-5-git-send-email-proljc@gmail.com>
Date: Tue, 16 Jul 2013 10:06:12 +0800
Message-ID: <CAJBMM-v3vXv6PyYbUsRe-re3-jX27bSHJuAzLFEz_vgoLKX+=g@mail.gmail.com>
From: Jia Liu <proljc@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Subject: Re: [Qemu-devel] [PATCH 4/4] target-openrisc: Fix cpu_model by name
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>

On Tue, Jul 16, 2013 at 10:00 AM, Jia Liu <proljc@gmail.com> wrote:
> Fix cpu_model by name, make any and or1200 works both OK.
>

Sorry, I forgot add V2 in title.

> Signed-off-by: Jia Liu <proljc@gmail.com>
> ---
>  target-openrisc/cpu.c | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
> index e348df0..6637166 100644
> --- a/target-openrisc/cpu.c
> +++ b/target-openrisc/cpu.c
> @@ -100,11 +100,19 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)
>      typename = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model);
>      oc = object_class_by_name(typename);
>      g_free(typename);
> -    if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) ||
> -                       object_class_is_abstract(oc))) {
> -        return NULL;
> +
> +    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) != NULL
> +        && !object_class_is_abstract(oc)) {
> +        return oc;
>      }
> -    return oc;
> +
> +    oc = object_class_by_name(cpu_model);
> +    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) != NULL
> +        && !object_class_is_abstract(oc)) {
> +        return oc;
> +    }
> +
> +    return NULL;
>  }
>
>  static void or1200_initfn(Object *obj)
> --
> 1.7.12.4 (Apple Git-37)
>