From patchwork Sun Mar 1 00:31:35 2015 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: 444686 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DF98E1400F1 for ; Sun, 1 Mar 2015 11:32:12 +1100 (AEDT) Received: from localhost ([::1]:42987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRrnm-0008Ig-TT for incoming@patchwork.ozlabs.org; Sat, 28 Feb 2015 19:32:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRrnT-0007my-R7 for qemu-devel@nongnu.org; Sat, 28 Feb 2015 19:31:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRrnP-0002Ru-4P for qemu-devel@nongnu.org; Sat, 28 Feb 2015 19:31:51 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36450 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRrnO-0002R2-V7; Sat, 28 Feb 2015 19:31:47 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1A0C3ABED; Sun, 1 Mar 2015 00:31:44 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 1 Mar 2015 01:31:35 +0100 Message-Id: <1425169895-10783-1-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 2.3.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: "open list:Overall" , Alexey Kardashevskiy , Alexander Graf , qemu-stable@nongnu.org, "open list:PowerPC" , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH] Revert "target-ppc: Create versionless CPU class per family if KVM" 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 reverts commit 5b79b1cadd3e565b6d1a5ba59764bd47af58b271 to avoid double-registration of types: Registering `POWER5+-powerpc64-cpu' which already exists Taking the textual description of a CPU type as part of a new type name is plain wrong, and so is unconditionally registering a new type here. Cc: Alexey Kardashevskiy Cc: qemu-stable@nongnu.org Signed-off-by: Andreas Färber --- target-ppc/kvm.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 1edf2b5..9d614ef 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -2160,18 +2160,6 @@ bool kvmppc_has_cap_fixup_hcalls(void) return cap_fixup_hcalls; } -static PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc) -{ - ObjectClass *oc = OBJECT_CLASS(pcc); - - while (oc && !object_class_is_abstract(oc)) { - oc = object_class_get_parent(oc); - } - assert(oc); - - return POWERPC_CPU_CLASS(oc); -} - static int kvm_ppc_register_host_cpu_type(void) { TypeInfo type_info = { @@ -2181,7 +2169,6 @@ static int kvm_ppc_register_host_cpu_type(void) }; uint32_t host_pvr = mfpvr(); PowerPCCPUClass *pvr_pcc; - DeviceClass *dc; pvr_pcc = ppc_cpu_class_by_pvr(host_pvr); if (pvr_pcc == NULL) { @@ -2192,14 +2179,6 @@ static int kvm_ppc_register_host_cpu_type(void) } type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc)); type_register(&type_info); - - /* Register generic family CPU class for a family */ - pvr_pcc = ppc_cpu_get_family_class(pvr_pcc); - dc = DEVICE_CLASS(pvr_pcc); - type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc)); - type_info.name = g_strdup_printf("%s-"TYPE_POWERPC_CPU, dc->desc); - type_register(&type_info); - return 0; }