From patchwork Wed Aug 10 05:45:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9272685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D3D87600CB for ; Wed, 10 Aug 2016 05:44:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA68C26538 for ; Wed, 10 Aug 2016 05:44:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AECAD27DCD; Wed, 10 Aug 2016 05:44:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E8C2A26538 for ; Wed, 10 Aug 2016 05:44:42 +0000 (UTC) Received: from localhost ([::1]:39441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXMJm-0007AA-2Z for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 Aug 2016 01:44:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXMIw-0006or-AM for qemu-devel@nongnu.org; Wed, 10 Aug 2016 01:43:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXMIt-0001T3-5d for qemu-devel@nongnu.org; Wed, 10 Aug 2016 01:43:49 -0400 Received: from ozlabs.org ([103.22.144.67]:45896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXMIs-0001Se-Re; Wed, 10 Aug 2016 01:43:47 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3s8Knr01Dvz9t1S; Wed, 10 Aug 2016 15:43:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1470807824; bh=mmxGP9Sy8CSppyqwampOnhJOrbbBswLyw7OgJMJGUjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SBbL/wOxwoCRs/OnzCZhZVmRjzXGO1dvyPpfhuhKmsVUGOh+vmVXcMvUyqZZDGfJ2 UE+aikLsAlVk9bN0FCZ+NHjfkzTsetRhnLlZpKOJ2G44VQ9GK9lzlkxt4wQytzfsv5 ruWobjRc+1vZRi4E4mgOm7my8c5Q6LRAv3LE5kZs= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 10 Aug 2016 15:45:40 +1000 Message-Id: <1470807941-25931-6-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470807941-25931-1-git-send-email-david@gibson.dropbear.id.au> References: <1470807941-25931-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 5/6] ppc/kvm: Do not mess up the generic CPU family registration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, imammedo@redhat.com, David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth The code for registering the sPAPR CPU host core type has been added inbetween the generic CPU host core type and the generic CPU family type. That way the instance_init and the class_init information got lost when registering the generic CPU family type. Fix it by moving the generic family registration before the spapr cpu core registration code. Signed-off-by: Thomas Huth Signed-off-by: David Gibson --- target-ppc/kvm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 84764ed..82b1df9 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -2394,6 +2394,13 @@ 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); + #if defined(TARGET_PPC64) type_info.name = g_strdup_printf("%s-"TYPE_SPAPR_CPU_CORE, "host"); type_info.parent = TYPE_SPAPR_CPU_CORE, @@ -2406,13 +2413,6 @@ static int kvm_ppc_register_host_cpu_type(void) type_info.instance_init = NULL; #endif - /* 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; }