From patchwork Thu Apr 30 11:51:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 185904 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp2000887ilf; Thu, 30 Apr 2020 05:00:02 -0700 (PDT) X-Google-Smtp-Source: APiQypLa/wyAruOFivdhKXTG4TNjJnu4KTNVdsUqhrGODJvltVSTBp5KeK00UeKXD+XrUrHEaSh8 X-Received: by 2002:ac8:370c:: with SMTP id o12mr3216209qtb.380.1588248001986; Thu, 30 Apr 2020 05:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588248001; cv=none; d=google.com; s=arc-20160816; b=l4nkVMtVBVO3K+5PTqVgqHuAJvJ2JN5NxaRznDnt02GyTxIWQT7D8Gyga4Z2SAj6Eq umSwnmODuRDNSUFYo/PUbblVhVP5MVq2DQKPRY5if/QvNSD1ZVUvrf4hAZG0QR7eS6o3 x8s5VZbdjEPyromBL5xCftoyaB4yCAjylVNtEqKqx5zEAsq9eH5z2azfYX6F1OBCR8zU tGy6/WkNVGtHepM6u+Tn9tfgK0ye5wDtPQrfuREmLBySdbNM95GcgRcpazd2E9MmMghx aHBWcLq+6Iha7e0i+vEICuWBw+tyLqX94BL8EWs33gpPl+6TmwCknNefmq/ENZ0uJMf5 Hfpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RCca2W4lwjdzEpAu/gQsnddTCCmaj3klMrOHk+9dWSk=; b=dl5wIB8uAWHBJrijVXtCP44FWjTcgzeA3J1h1Q6j55FWzWBCTfdlp/WR9uK6TX5w3U DwB9sianDQFVAzT1kNsMY+Ct+linpfDldVwR1V9fwT5OtcK21FHPi9pjhrrQHNhvXJFy 8aaEtLXCDAHNK2RQZ1h016BqUq67/FPPoDaMnUkJwk3SYWfhYkLVvIsvbxqUL9kFhqH1 Ougslgjr649k722RUi3/M156Y+JYpNX0reO/I/e2wgsreBumJwHPGpuC3/0mH8uJkEkC owiC6Rzzo50DcdW0elv4mQBNRwbOY3WW7MxnGm3+okwReuBjN/vXEZgBui/Zu1dJHHcO PlMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aeEeQAr8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id d16si1277789qka.337.2020.04.30.05.00.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Apr 2020 05:00:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aeEeQAr8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7rE-0002vF-Vj for patch@linaro.org; Thu, 30 Apr 2020 08:00:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33928) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7jm-0003Sa-3p for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU7jj-0000SE-HF for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:17 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:46379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jU7jj-0000Rj-2X for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:15 -0400 Received: by mail-wr1-x436.google.com with SMTP id f13so6474952wrm.13 for ; Thu, 30 Apr 2020 04:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RCca2W4lwjdzEpAu/gQsnddTCCmaj3klMrOHk+9dWSk=; b=aeEeQAr8VBAx9n24ThCp5ebWUh4vi2a5sCZlQwsvRzgpleLR9stUw1UuMFxKT/CBRl 7+gTnn3P50N+v2zzi9BQAAQprNSFOaH42XF1K7YeqIoKcvC0GTXFbFxKnDNNk4K/MPX6 seiYTp8qmqtsGiF1pHgPWhU+gCrWkXAAPqLDDAOdNBLkOH5M70AKPRF3Mwy6qO9rVthB 2iTawhlHanvS5U1PlnGRuLfuAD+tGiGXxR2ubxCbAqDVbbGWseZhCuyNDikeqpwM6463 0RVjnDERzK5G0htZHxH2U+tin9j00VfRhUtbyohuR3IPFMCy05xpK61fcGyfIxf34ry4 iRGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RCca2W4lwjdzEpAu/gQsnddTCCmaj3klMrOHk+9dWSk=; b=otnpwP7I1Q/uVXomafBQaEk4aLWiIXmOC89Z3AdaZZmtcI7GzF5lU2wgnduv1W3yhi nHkzqy7upJxLiMsHKOBDiDnIDgd4UDBBxEUuDnYFPYWLQQI9ELfgpPVa8CAyZYRy+LCo wZZBKkDwJeARw9IoImrDoIQoA0knLXJyYkPcFpQGFBMk/3eV3a4FIMBR18XQjc8mmhYO JLaLRytj1IHqwnTd10onNa6RXi38d1jvFHNdrOn9Dx8QXa1/Y/0k3GHdR0P2ftw1eJtk 7dYKuYMd/sFj2CgkFC0S7cGCMFnugKDP1KVn7JtY/hvQshLBtXuWxoVRtjtsuCVWvPes eCPg== X-Gm-Message-State: AGi0PubeDwOCeMh3sp5lOQskaF0WYb8vpXkP5R+QyebrMDxS6fdCz5xg VBzZ3vSuTNIkHs183/gGhRvKhdyplvIO5g== X-Received: by 2002:adf:f0ca:: with SMTP id x10mr2258511wro.112.1588247533476; Thu, 30 Apr 2020 04:52:13 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j22sm491518wre.84.2020.04.30.04.52.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 04:52:12 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/31] target/arm/cpu: Use ARRAY_SIZE() to iterate over ARMCPUInfo[] Date: Thu, 30 Apr 2020 12:51:37 +0100 Message-Id: <20200430115142.13430-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430115142.13430-1-peter.maydell@linaro.org> References: <20200430115142.13430-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::436 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-id: 20200423073358.27155-4-philmd@redhat.com Signed-off-by: Peter Maydell --- target/arm/cpu.c | 8 +++----- target/arm/cpu64.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 47e35400da2..30e961f7754 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2745,7 +2745,6 @@ static const ARMCPUInfo arm_cpus[] = { { .name = "any", .initfn = arm_max_initfn }, #endif #endif - { .name = NULL } }; static Property arm_cpu_properties[] = { @@ -2893,14 +2892,13 @@ static const TypeInfo idau_interface_type_info = { static void arm_cpu_register_types(void) { - const ARMCPUInfo *info = arm_cpus; + size_t i; type_register_static(&arm_cpu_type_info); type_register_static(&idau_interface_type_info); - while (info->name) { - arm_cpu_register(info); - info++; + for (i = 0; i < ARRAY_SIZE(arm_cpus); ++i) { + arm_cpu_register(&arm_cpus[i]); } #ifdef CONFIG_KVM diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 74afc28d537..b8177f59f5a 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -742,7 +742,6 @@ static const ARMCPUInfo aarch64_cpus[] = { { .name = "cortex-a53", .initfn = aarch64_a53_initfn }, { .name = "cortex-a72", .initfn = aarch64_a72_initfn }, { .name = "max", .initfn = aarch64_max_initfn }, - { .name = NULL } }; static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp) @@ -848,13 +847,12 @@ static const TypeInfo aarch64_cpu_type_info = { static void aarch64_cpu_register_types(void) { - const ARMCPUInfo *info = aarch64_cpus; + size_t i; type_register_static(&aarch64_cpu_type_info); - while (info->name) { - aarch64_cpu_register(info); - info++; + for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) { + aarch64_cpu_register(&aarch64_cpus[i]); } }