From patchwork Thu Feb 16 17:11:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 654068 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp86573wrc; Thu, 16 Feb 2023 09:15:42 -0800 (PST) X-Google-Smtp-Source: AK7set87yk23IUjDy+b/sdfrYNO30GBixznzOBYaKWVbrH4/eil7jToGoCbQ0Ml9/4eAqFh+PcwF X-Received: by 2002:a05:6214:c63:b0:56e:b91f:aeb4 with SMTP id t3-20020a0562140c6300b0056eb91faeb4mr12230438qvj.36.1676567741858; Thu, 16 Feb 2023 09:15:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676567741; cv=none; d=google.com; s=arc-20160816; b=jQlbuWI4EZwHVJpaP2Yx+Bo0AzWn0wDiggSoTmRIF2oqYSOqO0KNlF43u5gaNh66Tb avyroU1z1QcsTJkfR3WUTCGnJJN5Do7McO5SaSV0pVeydkPiyvTjZk+PgWAEeS5YGlWs BwCPmXkszlfOR2LY62yvhI/4eaGMR7AaxdbuWDgsDeyWyTgxdVb8HcotqCokkoeeyNvb EtfbeUXNkyyfHmdXxehr4wAlh+1ydqV6ZusgWemFEA/ZPLyDLwPrFqXMZr6+waMrm6aF Np1tK7Ri3x4VZk1G8xfSAkFSKPfSc0w9e9vmWX6HuGr0WWbvk9kQfWaLJnkx2z1AaB7J /eng== 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=b/ZJPvKYLNs02JbKxyWAve6/lJ0RBSn21cgFd8J9qhw=; b=j2Vdl6eh6xQ3nc3Fhw69I+046XZBxDkb8QCw8GzDnsHJLYr7EVGFVyvVnQURMwtS8u I8YcUGPV9JwQd2gt0ajwrZm4VRFx3SmQskSFdJSeIKZyNhxu0lQc7mvvgvL7wqkLhNmQ 6jeILDp3WEyHOOeXXI0sFe+hAm7/6DmJQe0Eqjdu2+QrtlJJcRVcsUGHJae+eMNLwxQn W0L3+uLZVPsWWwimpk1uz4CRCJsx1MmphxFrRxfSH8KqeBer2a2iU5VTSSRHuqXOlH81 Nxh78PWznEUO3hMRHj9/QTGni/PdFEabLdY43WQMpyD49wvP088Cc+z5lYEBfaO8PA6J NWjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="N/bTgqvL"; 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 s201-20020a3745d2000000b00719f547eb67si1740519qka.183.2023.02.16.09.15.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Feb 2023 09:15:41 -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="N/bTgqvL"; 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 1pShnK-0008EO-Me; Thu, 16 Feb 2023 12:11:42 -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 1pShnJ-0008Bb-1w for qemu-devel@nongnu.org; Thu, 16 Feb 2023 12:11:41 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pShnH-0007sY-GM for qemu-devel@nongnu.org; Thu, 16 Feb 2023 12:11:40 -0500 Received: by mail-wr1-x431.google.com with SMTP id o15so2519809wrc.9 for ; Thu, 16 Feb 2023 09:11:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b/ZJPvKYLNs02JbKxyWAve6/lJ0RBSn21cgFd8J9qhw=; b=N/bTgqvLq/x6rhJOCGYWLDaW+b6ku9+Tf7tyNqG9vH7C7EC9DcFOGSA2u491T9nlet 27fmOMY+fXlG/Z2VqzBNzVaAJSxM00UAtliDF9M1D29pejtPLGUCu+rARtXUCSNNDheN WP9Ry7nE2GlkMn2MOJ5mzNgfSFXYi0b3AKQ8dx40odPp5IIxm9SXKeURXoPU5akdPFo9 lADCBp4UhVzrf3Vd2LoTNkxuWIOE8jOXUydVAiigwIKd4x7SrN3eJ6aM+dkP0Vzrb7Iv jgC+/o8ahUDYs4BCevqb9Y8ts+i1VofYnSRNIOjc42/RVi/jRErEvdYq0VcqpmPtGB5L o/SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b/ZJPvKYLNs02JbKxyWAve6/lJ0RBSn21cgFd8J9qhw=; b=5RULK+tGb9Tg0LI2BqqtJVSaUjZiEMLWuqvAQv6T4SvN0b3qimh6Tf9+02H0yxoKgg QXLX5lRiOSVUux4BcGuidn9WOFdOYlRRQLNLtwcKcBb9wt9tMCfModocZKrlgn6K8SR6 aAe7/76G5CmJcKqaA9m9hBQ9d9aKvqf2eZ5lZjJW5Y/2+xE35Q9jol+mYlUDM50aMX6Q cpf2/K1A9x+h0JOiH6o5F4HLTl84mxxcQ7urq2UWtCl493TmJ/Kwl9xYLp1FDqTNo9RY lWbvIek7DzeazvYxD+Mk0MEixVJKKVNXqu8l9fMoWWri88LE6a5W2CAWqVTkjwMUB3Jg dIkg== X-Gm-Message-State: AO0yUKW7yO1XlleWIVdC3Mx2vm6rKs5Lx//O7mGEkwULN8tGDX88cWKj /pU+Ric4XwwtxNMkR/AI8Yfwpe26GKMnikv4 X-Received: by 2002:adf:f111:0:b0:2c5:586b:f53d with SMTP id r17-20020adff111000000b002c5586bf53dmr5085650wro.48.1676567498012; Thu, 16 Feb 2023 09:11:38 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002c556a4f1casm2049107wru.42.2023.02.16.09.11.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 09:11:37 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/30] arm/virt: don't try to spell out the accelerator Date: Thu, 16 Feb 2023 17:11:08 +0000 Message-Id: <20230216171123.2518285-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230216171123.2518285-1-peter.maydell@linaro.org> References: <20230216171123.2518285-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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 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-bounces+patch=linaro.org@nongnu.org From: Cornelia Huck Just use current_accel_name() directly. Signed-off-by: Cornelia Huck Reviewed-by: Eric Auger Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- hw/arm/virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 75f28947de0..8d13e4486b1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2133,21 +2133,21 @@ static void machvirt_init(MachineState *machine) if (vms->secure && (kvm_enabled() || hvf_enabled())) { error_report("mach-virt: %s does not support providing " "Security extensions (TrustZone) to the guest CPU", - kvm_enabled() ? "KVM" : "HVF"); + current_accel_name()); exit(1); } if (vms->virt && (kvm_enabled() || hvf_enabled())) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", - kvm_enabled() ? "KVM" : "HVF"); + current_accel_name()); exit(1); } if (vms->mte && (kvm_enabled() || hvf_enabled())) { error_report("mach-virt: %s does not support providing " "MTE to the guest CPU", - kvm_enabled() ? "KVM" : "HVF"); + current_accel_name()); exit(1); }