From patchwork Wed Jan 10 19:53:27 2024 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: 761458 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp2053455wrz; Wed, 10 Jan 2024 11:56:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IE1yGDT2232IdYLXkn1o4ahpVj1AgrQ6RErmQK6gziZb42l+0Wj5iqTJnQ73qhjcXecqh27 X-Received: by 2002:a0c:f394:0:b0:681:2253:f4f1 with SMTP id i20-20020a0cf394000000b006812253f4f1mr831806qvk.8.1704916578421; Wed, 10 Jan 2024 11:56:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704916578; cv=none; d=google.com; s=arc-20160816; b=Id0zw3G0Iodt/eLgnXpbuVSZOHnOl+RMj4g5L2gnYLmj8hsaqOkFjbDrSwIf4Diube y0zk+xwvsXt1ohL5jrV4l9gWlpwhHI6JNXQ5lQl0wBeHD6/KnnNBoruNbrqJ5Td5OR4v gTUkLIxOoxIeLJBcFEsIkVbTQijZOowP1VvviQiILskUFoANdQoj8qrC+xV6KZJqcSNx EItmbxDfgK+MBj/NKRAkFCqBPomMU8hKd2Q3uW2Kn/7u/aQJO/nrX8R34tranbuWSSte VZsfhOPoqnb/wDrjCX7FfXP+EhXwWbGFA2zHNb49RHvvaNCk+6025euslIB8sSsEnMhr hJGQ== 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:cc:to :from:dkim-signature; bh=GdLxkKJBM9/8cO5ervTCmHlXNSnSwQGVSVS04z23rsg=; fh=0Bn9ysFO5uhdOoEvdDNDnkwY7yFMuDt2XLw3k0zcWt8=; b=nhEVLKLfFBq/Q4C5xpKIefw4efb3ex05g/FfLOSVrM4u3u9rA4zDm17KWU3VBuMw3e ot6KI0hwB7HBl+kTYjsv7ywUL3zBl4I/shmgx2yad79xTYyHooYBoClC/VMYZBikIYrJ buG0Sb3Q3a7TEXCz1UExno7hBY7TOle2LQN4164quBOE/+0tAwYK/qL/ZsdEbRQ+jR12 FhXuHyqfQ7zA9oqN/k/DnCkx68ormzcKmbaPT8frb+ThLKT0rC/y3ztH877a8vOZ+mbD Z6+uv1+9IEoHy1JS6FEuFXCbW2wwX4c3CAXDNFmoKvGZrtj6TyfUGbKBb3Q73QYvKqWL F8vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EKj+67dz; 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 t7-20020a0c8d87000000b0067a90d3023esi4985535qvb.279.2024.01.10.11.56.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2024 11:56:18 -0800 (PST) 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=EKj+67dz; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNefQ-0002hh-Tz; Wed, 10 Jan 2024 14:55:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNefO-0002Xh-Bf for qemu-devel@nongnu.org; Wed, 10 Jan 2024 14:55:10 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNefL-0002k5-Ec for qemu-devel@nongnu.org; Wed, 10 Jan 2024 14:55:10 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40e461c1f5bso40927795e9.3 for ; Wed, 10 Jan 2024 11:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704916504; x=1705521304; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GdLxkKJBM9/8cO5ervTCmHlXNSnSwQGVSVS04z23rsg=; b=EKj+67dzGGcJEktekhv03Zfd9BBbQzSSHDeFy/cruLN3+OBpYmqK3djCAi3MVre7Mb 8axhWD1eU/DaLnIrHveid3oimut5Q4bn+tP6LHutXZiy4LkVr3FENhEII1iH0Y6gFckl AMuhm6GqqSbUAe/JRyFcaXFhJDUCZ/iCsWoopt87ixMd/ewGndMkLIpWt4QTxAK7/Gj7 YNOG9jJZWnya07JrrSl1OexPOHPu1DzCFUexEOPG6tZdlz1M4GeN1qahtinITcwFRF9e CJpDefS4feWllaF0hww//we1AkVyujGSyR61DgswvoD67b1Hnu8aP3k6WKkK1WABGMly QrGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704916504; x=1705521304; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GdLxkKJBM9/8cO5ervTCmHlXNSnSwQGVSVS04z23rsg=; b=nK8Bmr2YjfoW645q63R+tCb4+lyh47v96ZqZZ0DyKhPwOAJZXC37nN2qt63Ft13IHJ +ETKKzpEzyryYTMZF/7m4JsbfBK4B+6EvTiJEU+LgYzkGCTJRwSWLj2z1nvxKsjyzH72 15K/HYnFWIsKSngJaqD2UNacWo88z29AxTJrx+UFAwuOd0EgPnTEsgcpQw46NdfwTE0W VPe0Lt2b1l946EP2NYIsUOCi/6ldscLzIpiSX3dFY/unGu1gpSZH9VMuV8O6ZKRuGWoF gP9CJH1iMIbDm2Qgq9Dh7FjZY4OTFShoXQxc1aBG9yESuc3NJ6rLm2WMz2IpyIUB5GrL +M7w== X-Gm-Message-State: AOJu0Ywy++AF9OB2pRh07OWJcAu57W4T0F68jymvlfqbsP9M6HNQkIGy Hi+AR4g1K3JoUM0wzd/KbZIh7ljd3+J5kK1m5n1m8rQGIyg= X-Received: by 2002:a05:600c:4f85:b0:40d:4e28:43e8 with SMTP id n5-20020a05600c4f8500b0040d4e2843e8mr783060wmq.167.1704916503990; Wed, 10 Jan 2024 11:55:03 -0800 (PST) Received: from m1x-phil.lan (vau06-h02-176-184-43-236.dsl.sta.abo.bbox.fr. [176.184.43.236]) by smtp.gmail.com with ESMTPSA id w4-20020adfec44000000b0033662fb321esm5583482wrn.33.2024.01.10.11.55.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 10 Jan 2024 11:55:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcin Juszkiewicz , qemu-arm@nongnu.org, Kevin Wolf , Igor Mitsyanko , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , "Edgar E. Iglesias" , Leif Lindholm , Rob Herring , Markus Armbruster , Alistair Francis , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v3 13/14] hw/arm: Prefer arm_feature(AARCH64) over object_property_find(aarch64) Date: Wed, 10 Jan 2024 20:53:27 +0100 Message-ID: <20240110195329.3995-14-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110195329.3995-1-philmd@linaro.org> References: <20240110195329.3995-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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=unavailable 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-bounces+patch=linaro.org@nongnu.org The "aarch64" property is added to ARMCPU when the ARM_FEATURE_AARCH64 feature is available. Rather than checking whether the QOM property is present, directly check the feature. Suggested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 49ed5309ff..a43e87874c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2140,7 +2140,7 @@ static void machvirt_init(MachineState *machine) numa_cpu_pre_plug(&possible_cpus->cpus[cs->cpu_index], DEVICE(cpuobj), &error_fatal); - aarch64 &= object_property_get_bool(cpuobj, "aarch64", NULL); + aarch64 &= arm_feature(cpu_env(cs), ARM_FEATURE_AARCH64); if (!vms->secure) { object_property_set_bool(cpuobj, "has_el3", false, NULL);