From patchwork Fri Feb 3 14:29:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 650043 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp849657pva; Fri, 3 Feb 2023 06:31:11 -0800 (PST) X-Google-Smtp-Source: AK7set8AnFOtZrJUGLKAUAGhMzuCZeY9XyzOkMp+kuTj2/1fALFJ2KO0mJ4kZa2yBf0htBPlg0VL X-Received: by 2002:ac8:7f47:0:b0:3b9:a532:a1d with SMTP id g7-20020ac87f47000000b003b9a5320a1dmr19117467qtk.58.1675434670906; Fri, 03 Feb 2023 06:31:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675434670; cv=none; d=google.com; s=arc-20160816; b=lwh3w6YmYwe/gw7jO7dlnLjlMpv/BXP8y5XIHClub80y5Tcbf3cwOpJVnIl0+/aFDv 1QUBTN1+LKrqSmzLHIWhNI6ok4pkF078Fll0zEUnsmh7SPwiSkWuDMzvr/iJ5SwXtMXQ 5eEZ5+zPA3xo9hNpq24LZFcUQnxqlUkoET/bPI2cP9wNcdpXKqwXhfLpmlgkIbO7AI0d 9obtV2WNKjGO5fp5sw3DYvAaPcnBeiFjvAEEtZyFkWB92n6XtgbhahyxYfajb2fTnWoB MsOxDqrOImIAqMMd3kzqMhswWRtIJFi9TMwXQocb7vVcWLy1xBuv1ukvImdfS5IKCe2N 9D9w== 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=hajMqWBba417xljX2PthUn9B4t3yYT0YWGuT0ofiAD4=; b=xoG6oE7UKA4dKD59+fEab2U2min3jjyx0M5z7Q8wd9xzPie95Zib6aFKbtHI0srR4Z PdkOJqirA8X+TaFyUGz+ktca9vBzg3nTJsfM13YsztpqqRq08mCQQBA6H0Zo8oMakpdr h2JfWcQxA+NWOz9Henz94ecd2GNXWUuFfSl0CKs/DrKT5nZLLsIVSGL7vKFkgwpq98tm qyz6TK7HSk4iL/ypl6OeZoYoKhV/WBxrr4OIOFawr5Ir6kb+5lz9zqN4KlBdfjQs7kss 9hkcdOI8RQT0Zk57VJ6ftY8z/R58rpUOzLDMHBEfG5LJ5rU9hEJqjnUMU7FKhXRnnrva Behw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zXafyWWn; 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 y3-20020a0ce803000000b004c6d74d313dsi1551591qvn.351.2023.02.03.06.31.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Feb 2023 06:31:10 -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=zXafyWWn; 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 1pNx4d-0006jI-P8; Fri, 03 Feb 2023 09:29:56 -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 1pNx4U-0006fP-Lo for qemu-devel@nongnu.org; Fri, 03 Feb 2023 09:29:46 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNx4M-00055T-T2 for qemu-devel@nongnu.org; Fri, 03 Feb 2023 09:29:43 -0500 Received: by mail-wm1-x336.google.com with SMTP id k16so4011794wms.2 for ; Fri, 03 Feb 2023 06:29:37 -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=hajMqWBba417xljX2PthUn9B4t3yYT0YWGuT0ofiAD4=; b=zXafyWWnS/sBsfgec+52+1yPAb5prgixQCW2hETKzQ61js4oR6oA+TDj47pC/shGvS gvtk2c8z4XEj/qnkFDw7B6vcU6K204wJPQE3F26T2YqdOYBBBKAQ7wtpDexB0Fwv5nTD SYG6w8kG1Fak8EqHgp4RXXmc8/HD3NvSOo5pv7qDQfDPcr8YD7Y+1f8/guyzN8aynwdK MICpDZynT/QvYVE37PosFyOHv7nJWQ0nYSY3PXhYLDlPmuzBT9YYr2fEBdilfVBQ6VkW DhNj+Ppf5XATy6oyjY5AYLRilwX+4D5BNnm3yZ9Vr9QAsaqMd68BErPelHAydbADy0a5 /NJg== 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=hajMqWBba417xljX2PthUn9B4t3yYT0YWGuT0ofiAD4=; b=njjEkUxtTQ8Vb+MoZdOmW1XAkP7xGeR7ZNwOmvZJT+YOJsONbPh/aJWpLI4aC7I2UQ x4MAImbJOUfivygufiM+BRCKhJQPiymjwDXEn1wSTV+UaKEs6CNyWWz4U8xEVVrCAH6O ewCom0xvspNSmpdphdN9Yrerga6p1ViPUHdDkxp9mpog1PsmMXpOF4MasW59GxHJlNnQ GMHfRe0C1S87jHub2EgxUKsqzrf1vWuscuiJwagrsGzZ41Wj9GtncI/mArtc44k+bOOA Dtyh6qxnUZh5Iumlws1RJlyPCvj/jGGkQWRqXDVpDik3yWuh/nEVe2IswgUiZSZtAs62 t+Eg== X-Gm-Message-State: AO0yUKUyLEDPFGkaAaUv1JWR+hZYCzDeYidMkKiu92svjWm0JW1AqOIM Tut9pg8DRcRUWUiiFIk7eRKke1EjpuJ5CNQq X-Received: by 2002:a05:600c:3545:b0:3df:ea9a:21c7 with SMTP id i5-20020a05600c354500b003dfea9a21c7mr1827418wmq.33.1675434576722; Fri, 03 Feb 2023 06:29:36 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j14-20020a05600c130e00b003df241f52e8sm2578492wmf.42.2023.02.03.06.29.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 06:29:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/33] hw/arm/virt: Make accels in GIC finalize logic explicit Date: Fri, 3 Feb 2023 14:29:03 +0000 Message-Id: <20230203142927.834793-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230203142927.834793-1-peter.maydell@linaro.org> References: <20230203142927.834793-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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: Alexander Graf Let's explicitly list out all accelerators that we support when trying to determine the supported set of GIC versions. KVM was already separate, so the only missing one is HVF which simply reuses all of TCG's emulation code and thus has the same compatibility matrix. Signed-off-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck Reviewed-by: Zenghui Yu Reviewed-by: Richard Henderson Message-id: 20221223090107.98888-3-agraf@csgraf.de [PMM: Added qtest to the list of accelerators] Signed-off-by: Peter Maydell --- hw/arm/virt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 28c43d59fbd..ba477282885 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -47,8 +47,10 @@ #include "sysemu/numa.h" #include "sysemu/runstate.h" #include "sysemu/tpm.h" +#include "sysemu/tcg.h" #include "sysemu/kvm.h" #include "sysemu/hvf.h" +#include "sysemu/qtest.h" #include "hw/loader.h" #include "qapi/error.h" #include "qemu/bitops.h" @@ -1929,7 +1931,7 @@ static void finalize_gic_version(VirtMachineState *vms) /* KVM w/o kernel irqchip can only deal with GICv2 */ gics_supported |= VIRT_GIC_VERSION_2_MASK; accel_name = "KVM with kernel-irqchip=off"; - } else { + } else if (tcg_enabled() || hvf_enabled() || qtest_enabled()) { gics_supported |= VIRT_GIC_VERSION_2_MASK; if (module_object_class_by_name("arm-gicv3")) { gics_supported |= VIRT_GIC_VERSION_3_MASK; @@ -1938,6 +1940,9 @@ static void finalize_gic_version(VirtMachineState *vms) gics_supported |= VIRT_GIC_VERSION_4_MASK; } } + } else { + error_report("Unsupported accelerator, can not determine GIC support"); + exit(1); } /*