From patchwork Thu Apr 23 07:33:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 284020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F6CDC2BA19 for ; Thu, 23 Apr 2020 07:37:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B74B21569 for ; Thu, 23 Apr 2020 07:37:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ABzNoJrz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B74B21569 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRWQf-0001IJ-He for qemu-devel@archiver.kernel.org; Thu, 23 Apr 2020 03:37:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46798) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRWNJ-0004z4-Uw for qemu-devel@nongnu.org; Thu, 23 Apr 2020 03:34:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRWNI-0006vi-RB for qemu-devel@nongnu.org; Thu, 23 Apr 2020 03:34:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23655 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRWNI-0006s5-EA for qemu-devel@nongnu.org; Thu, 23 Apr 2020 03:34:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587627259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mDbLYbJnK16dDXRL5VVauGB0aFR8uwkJ/bINCwCcCMA=; b=ABzNoJrzt/zryoX3iM7LiydkpWe9fiXbeayOk5Zwr2ZC+eBu0GJctfXDah8v9ddb61Gtx3 Q6Itr9UrGKUrf3kWX1c8pkLy5tEj19FUU4zMimE/maLfRmYEAProEw9HBQ64vVdYVji5Rn RrZeBmtOIWrQ8hSgx2V0X051lNt9ew0= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-DsIT0hslO-KoE9Q-JPLa_A-1; Thu, 23 Apr 2020 03:34:15 -0400 X-MC-Unique: DsIT0hslO-KoE9Q-JPLa_A-1 Received: by mail-wm1-f70.google.com with SMTP id f17so1934295wmm.5 for ; Thu, 23 Apr 2020 00:34:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T7HnB0KxDMdAS4VzLsEn4+uw/vEe0sZVaSPI+AwP3h8=; b=Joi4vWBMgTWYcLVP+1u1Oe1Sy+BpLG7RYqOR76AL1iFArZYOmx4ynEFghpHKNQN9RJ JIG/SFUBLPM2Uo8Ph5W2vMySUF44XJEyM5cvEs2wMlMjw3DLk79c5aHaDXLpP+dc3sSa kSM/Pduesa4rM9XsIdRYZxt8YY1Ye6SIs0gsqGSXvbIaaV5WXotDLreHMOklF1CXJWml 2dlbumM8GhK9gAywMiZcAcKQGJovsEROMEFRzy6zmtYMWj8jyyqER61eTOURYLxKqZ5V FW2mU8VaC4MKGCgsqqxVkTYwy+TobZ7OROd1DkJQfkjncoqZLPdshjzg+wuNLwQ3Fjgs 9q5Q== X-Gm-Message-State: AGi0PuYhRkoAGAnLRYfK2bvwEhvlCM2fc28Xk6iH/zezQW7/vIYAYNJ6 /yH++naSSGSKjtDQnh0aTgmDv8jqw1rpMabfHnIxqsxGMmj2O3gHUSOWJV07MUSRj/mu+ykxPoB RlxuBeLbzqKL6LuE= X-Received: by 2002:a5d:5646:: with SMTP id j6mr3489514wrw.207.1587627254305; Thu, 23 Apr 2020 00:34:14 -0700 (PDT) X-Google-Smtp-Source: APiQypKLsCfX3eGNO6Wy6xl+hmIR535ZIIetT9KW7T8HVMcVeJkAXSmaEkHHad7NmUV37opW+b5QJQ== X-Received: by 2002:a5d:5646:: with SMTP id j6mr3489494wrw.207.1587627254122; Thu, 23 Apr 2020 00:34:14 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id l16sm2385970wrp.91.2020.04.23.00.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 00:34:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/5] target/arm: Make cpu_register() available for other files Date: Thu, 23 Apr 2020 09:33:55 +0200 Message-Id: <20200423073358.27155-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200423073358.27155-1-philmd@redhat.com> References: <20200423073358.27155-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/23 01:42:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Richard Henderson , Eric Auger , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Make cpu_register() (renamed to arm_cpu_register()) available from internals.h so we can register CPUs also from other files in the future. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Reviewed-by: Eric Auger Message-ID: <20190921150420.30743-2-thuth@redhat.com> [PMD: Only take cpu_register() from Thomas's patch] Signed-off-by: Philippe Mathieu-Daudé --- target/arm/cpu-qom.h | 9 ++++++++- target/arm/cpu.c | 10 ++-------- target/arm/cpu64.c | 8 +------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h index d95568bf05..56395b87f6 100644 --- a/target/arm/cpu-qom.h +++ b/target/arm/cpu-qom.h @@ -35,7 +35,14 @@ struct arm_boot_info; #define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU -typedef struct ARMCPUInfo ARMCPUInfo; +typedef struct ARMCPUInfo { + const char *name; + void (*initfn)(Object *obj); + void (*class_init)(ObjectClass *oc, void *data); +} ARMCPUInfo; + +void arm_cpu_register(const ARMCPUInfo *info); +void aarch64_cpu_register(const ARMCPUInfo *info); /** * ARMCPUClass: diff --git a/target/arm/cpu.c b/target/arm/cpu.c index a79f233b17..47e35400da 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2693,12 +2693,6 @@ static void arm_max_initfn(Object *obj) #endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */ -struct ARMCPUInfo { - const char *name; - void (*initfn)(Object *obj); - void (*class_init)(ObjectClass *oc, void *data); -}; - static const ARMCPUInfo arm_cpus[] = { #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) { .name = "arm926", .initfn = arm926_initfn }, @@ -2864,7 +2858,7 @@ static void cpu_register_class_init(ObjectClass *oc, void *data) acc->info = data; } -static void cpu_register(const ARMCPUInfo *info) +void arm_cpu_register(const ARMCPUInfo *info) { TypeInfo type_info = { .parent = TYPE_ARM_CPU, @@ -2905,7 +2899,7 @@ static void arm_cpu_register_types(void) type_register_static(&idau_interface_type_info); while (info->name) { - cpu_register(info); + arm_cpu_register(info); info++; } diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 62d36f9e8d..951588c56e 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -737,12 +737,6 @@ static void aarch64_max_initfn(Object *obj) cpu_max_set_sve_max_vq, NULL, NULL, &error_fatal); } -struct ARMCPUInfo { - const char *name; - void (*initfn)(Object *obj); - void (*class_init)(ObjectClass *oc, void *data); -}; - static const ARMCPUInfo aarch64_cpus[] = { { .name = "cortex-a57", .initfn = aarch64_a57_initfn }, { .name = "cortex-a53", .initfn = aarch64_a53_initfn }, @@ -825,7 +819,7 @@ static void cpu_register_class_init(ObjectClass *oc, void *data) acc->info = data; } -static void aarch64_cpu_register(const ARMCPUInfo *info) +void aarch64_cpu_register(const ARMCPUInfo *info) { TypeInfo type_info = { .parent = TYPE_AARCH64_CPU,