From patchwork Mon May 30 16:05:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577196 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp382310mag; Mon, 30 May 2022 09:18:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNYXHVdoDHsayzS9oqdI6ajvCllPEwdfsCJvqfYpSKD15rxsLgaMMdiOcIpo/XzGKuQ9KI X-Received: by 2002:a05:6214:27c1:b0:464:2c1e:3feb with SMTP id ge1-20020a05621427c100b004642c1e3febmr13861007qvb.69.1653927527343; Mon, 30 May 2022 09:18:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653927527; cv=none; d=google.com; s=arc-20160816; b=ysiFjvp7SF/rhZuzlNkQm5Wl8XmqhMfV8llXI1Bu3kGQ6PciY/jpk7rx5JucH6FQ7V ETY2+LHH3dyYf/iqoOO6QAqbhfCNLgTMA/2+ZBKsQNHmlRZMPnX92GMxK7BfdKYPaflN m6tgbxabJAcb9pHBq0ycKvv/y/xlYIi5iWQZX8Y7yRwDOrcmHmQXNLh0TAH4gs/RXqEH llnbG3vqVHmLWDAisZNPnHw8MfFtLDKhAHHdRhZhRUiIiuxgrdwZJWAYbEfg+2JrhU1Y cfgHiiAf85iLE2XQ5gTCqWzmIVxOts9zjJFvxDcm5I/246PzXfX7nQK32F1CULRgUuqj ul8Q== 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=z/EiYIg0W6+dtf+QTbWYS+jOx0Pk8vnVY1fISas01J4=; b=Art+pWRMOu9I02ucodqdsAla+DTQBZnQ5eeRH2cEVgLYOBm1kJFMnRMoMp0ccj5WdE tJlbPxgqXJGH9/QK7GHSCngqDvnv/xSph6P/2ZOueUXsKMYAzGnpG/pKtBVcwQoUpDRI CJCKBQK536Wl4zgLwEmWTSrghjk3mLfdgAJOA0KaTxTjxGU5IN+Sr1RQzgEBcF2ySX7r 5CsGWmsBopmuKNMR9kZ91B4CXiZZJgfKOq5/WYQk7l5M/EJjYkRFgzTead2Pfgsks+SO PYtdcue8Fja1mKTsAFiQVgIdmqzG43L8VInoT9zDLiFDwDTWdYlQxZL/byrFUYbGXXuE HAmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kSps6zC8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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. [209.51.188.17]) by mx.google.com with ESMTPS id z20-20020ac87f94000000b002f93e72b3a0si7575985qtj.644.2022.05.30.09.18.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 09:18:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kSps6zC8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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]:56514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvi6Q-0005oQ-TB for patch@linaro.org; Mon, 30 May 2022 12:18:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhvN-0002e5-6V for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:21 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:46991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhvG-0007AW-4g for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id r123-20020a1c2b81000000b0039c1439c33cso1164091wmr.5 for ; Mon, 30 May 2022 09:07:12 -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=z/EiYIg0W6+dtf+QTbWYS+jOx0Pk8vnVY1fISas01J4=; b=kSps6zC81cchITJlV9DqAehU8MN3pIWwZPfsVjI7CHGg0KTNXSFt0PLL+VDy+viEwp O5CGVwwvXs5dactB0ZpTQt66sjKLvbjdwys8Cvjei+A43GXxlXauMLK3QUMtsiQJLKQ2 o4ssVn/5TpOtc32cNEtFgs+TFpugIHAZV+NSv4F3WSf3orwSZ3hSusSQpWc2qldguifx XgSR8RS5VAxnkWPUbTr0YoUjwrP1N5Dyt9EwV0rS9/YHDrOx1vTXzP6/lBtMufq+E8JZ q9P8h62b5r9oH20DDQhGHt7SGVTHQeHLj9xp+FuHpzW+9WCOHm7WAyGWMb8LLhs2tM2A HWNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z/EiYIg0W6+dtf+QTbWYS+jOx0Pk8vnVY1fISas01J4=; b=VEFscJm7mVNyi9qxMY3P6E7ful3qLTCVf8H/oU+FSC0Ho1rhvacpXJCShnXUMRXuuq zIPQEPwr4F3ae0Ly42/I/yXs50B/fvZXHfj7AqNucnEQQX8rcO4VlIjx47f14K7rhNrH DfnA/uCFzAKFpa38ptJK2/KjyMpssA0Upu/sn1jpNNPgg5SqbdRGfQAIxdnxL2CnWZaV 06/333rin7KZm7jDw9QropKwNDmrqoI3KxNtWGSJIzpw4wtXi4fbkNzawX/p7FyTfSiE h4NnlsfSujxKSb53bm6SzdQgVUPRlcaobOnyMV7NGKcMmyB7xPftztBy6unu3JV8Lmvm JGcA== X-Gm-Message-State: AOAM533OT7OCN3i8yIKZyLzxZooOxTDxgCTXTw1OqDkVXRucEfSHqL+e oBuZeoYTtPXTcT2ZkXQAYzvES3J1y7pzow== X-Received: by 2002:a05:600c:3ac7:b0:397:5cb4:a2b5 with SMTP id d7-20020a05600c3ac700b003975cb4a2b5mr19592605wms.5.1653926831789; Mon, 30 May 2022 09:07:11 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bi12-20020a05600c3d8c00b003974b95d897sm10232152wmb.37.2022.05.30.09.07.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:07:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 002/117] target/arm/hvf: Include missing "cpregs.h" Date: Mon, 30 May 2022 17:05:13 +0100 Message-Id: <20220530160708.726466-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220530160708.726466-1-peter.maydell@linaro.org> References: <20220530160708.726466-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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é Fix when building HVF on macOS Aarch64: target/arm/hvf/hvf.c:586:15: error: unknown type name 'ARMCPRegInfo'; did you mean 'ARMCPUInfo'? const ARMCPRegInfo *ri; ^~~~~~~~~~~~ ARMCPUInfo target/arm/cpu-qom.h:38:3: note: 'ARMCPUInfo' declared here } ARMCPUInfo; ^ target/arm/hvf/hvf.c:589:14: error: implicit declaration of function 'get_arm_cp_reginfo' is invalid in C99 [-Werror,-Wimplicit-function-declaration] ri = get_arm_cp_reginfo(arm_cpu->cp_regs, key); ^ target/arm/hvf/hvf.c:589:12: warning: incompatible integer to pointer conversion assigning to 'const ARMCPUInfo *' (aka 'const struct ARMCPUInfo *') from 'int' [-Wint-conversion] ri = get_arm_cp_reginfo(arm_cpu->cp_regs, key); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ target/arm/hvf/hvf.c:591:26: error: no member named 'type' in 'struct ARMCPUInfo' assert(!(ri->type & ARM_CP_NO_RAW)); ~~ ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/assert.h:99:25: note: expanded from macro 'assert' (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __ASSERT_FILE_NAME, __LINE__, #e) : (void)0) ^ target/arm/hvf/hvf.c:591:33: error: use of undeclared identifier 'ARM_CP_NO_RAW' assert(!(ri->type & ARM_CP_NO_RAW)); ^ 1 warning and 4 errors generated. Fixes: cf7c6d1004 ("target/arm: Split out cpregs.h") Reported-by: Duncan Bayne Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20220525161926.34233-1-philmd@fungible.com Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1029 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- target/arm/hvf/hvf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 86710509d20..1fdc5eef92b 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -17,6 +17,7 @@ #include "sysemu/hvf_int.h" #include "sysemu/hw_accel.h" #include "hvf_arm.h" +#include "cpregs.h" #include