From patchwork Mon Jan 28 16:18:46 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: 216295 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 A46682C008D for ; Tue, 29 Jan 2013 05:12:53 +1100 (EST) Received: from localhost ([::1]:34439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TztCN-0001Cq-Pw for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2013 13:12:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzrQr-0004jK-7G for qemu-devel@nongnu.org; Mon, 28 Jan 2013 11:20:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TzrQd-0002Qe-Aj for qemu-devel@nongnu.org; Mon, 28 Jan 2013 11:19:41 -0500 Received: from cantor2.suse.de ([195.135.220.15]:43594 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzrQd-0002Q0-0z; Mon, 28 Jan 2013 11:19:27 -0500 Received: from relay1.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 8E146A5255; Mon, 28 Jan 2013 17:19:26 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2013 17:18:46 +0100 Message-Id: <1359389934-16663-30-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359389934-16663-1-git-send-email-afaerber@suse.de> References: <1359389934-16663-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Peter Maydell , Paul Brook , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 29/37] target-arm: Catch attempt to instantiate abstract 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 This fixes -cpu arm-cpu asserting. Cc: qemu-stable@nongnu.org Acked-by: Peter Maydell Signed-off-by: Andreas Färber --- target-arm/cpu.c | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 57126b6..d1a4c82 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -210,7 +210,8 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) } oc = object_class_by_name(cpu_model); - if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU)) { + if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) || + object_class_is_abstract(oc)) { return NULL; } return oc;