From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:c8d8:b0:a3e:79c1:d636 with SMTP id gc24csp1995926ejb; Wed, 21 Feb 2024 07:39:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUS25GfM0iQegowTO2qUCQsMHJdbrm3hmb6l+gExjbfaQjcOC8PWwYG13jHCmhHmtZYoxENw0yJ3zwTZAQUPbRD3PZBiRrU X-Google-Smtp-Source: AGHT+IEds8yjDY/9jWf+Wa7Z8vVPY3z62M3oOW9z9X3mYQEIkY3TKcsFvErheXIAjdnM9As5ioxf X-Received: by 2002:a1f:4fc5:0:b0:4c0:1cc8:8821 with SMTP id d188-20020a1f4fc5000000b004c01cc88821mr16811475vkb.9.1708529951665; Wed, 21 Feb 2024 07:39:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708529951; cv=none; d=google.com; s=arc-20160816; b=ZxLRKve5rXjPbg1/K5/kwLTQ6DtDdGd0j0sP4Rtw/4BMOPLYwr19skoKZiCsGFEvph EUszwXK8LHHeS6lonFG+ue+heI+eM1CE4GJHW8K5uqid4iAp2SwtKZziBaM9tTKgwEDJ uwwbduAEN0s2JYWPpS4rwmb50xheAAG1lIY6fp9JWYUIU3BhJTJRgd02ElK1YmzQrU9X Gdr91h9ALhYwfMmYyp9e4bo24ZsGNBq3Ux8OgpldAW0ucPuz/h+83zoL7y6Ni9OPyAmO 4K2zrnZ0tkUN3xG7NdMDLgb+sgQ09jEXqEObcQIa4RL51sM0/87Nts2W8r2tZdKp38jv Hzlw== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=OMHhrbAanmo5lu+1OAkkg62WenW49sTgp4urIrYlrhY=; fh=IdnJT1ZTPFFQP+b/F4hVzCBqB+EkaP2hT3dxgu7w/BQ=; b=nudMnkU9DeuK0+HyAFOcsA5cV8zqB7kixsLhsFZr0XqvKb2JI+cioin59GfIVoZHVZ tIyh/eT8/eppDwRmGvmBMKlLeDLCRIGY8R1E2vPEH54FmscUcnK9GSsM/t0RqcaOTmFK NnFac8tPRzY+G1xa0qHnoTmDZNEgEnG9/IcmR5gRzi+4rZwwMG21NCndUXa+vZYrV16v Hy1mmNSABaNuYxgu4qnwWaaKkhmJQgs3UhEhxFJq8daXZka31Pp1EcAnd253mlWiOa1r wLryRAkotOeQA0Zdsu10pS5Lzs2B8u2B+TCGy3AfPKlq+gXsn/oBP+N9vYqVHCnTihlz xxFg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Qmrpo/df"; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gi8-20020a056214248800b0068cb64ecfd3si11623636qvb.86.2024.02.21.07.39.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 07:39:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=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=@redhat.com header.s=mimecast20190719 header.b="Qmrpo/df"; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcoak-0001gk-8J; Wed, 21 Feb 2024 10:33:02 -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 1rcoU5-0000w0-5P for qemu-devel@nongnu.org; Wed, 21 Feb 2024 10:26:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rckLa-0000xt-Hn for qemu-devel@nongnu.org; Wed, 21 Feb 2024 06:01:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708513264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OMHhrbAanmo5lu+1OAkkg62WenW49sTgp4urIrYlrhY=; b=Qmrpo/dfpRUGANuWiqRjRNRhq3vsTMxHX+I+kZATBGyTyvsFPGw+oX7/PX7c6QHxAT/1qM yk3s7Bsx702q+SLwEEC2AdVkxP0h3fkulSOYPlcWP4mmkTMpQJQA0kAqvE6eK/ikW27D/s 0DAPWC6CrvTWfWcPNeNsXEhcb/xoKWQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-580-S4ruVI8iNoq71RCxv7i-OA-1; Wed, 21 Feb 2024 06:01:02 -0500 X-MC-Unique: S4ruVI8iNoq71RCxv7i-OA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C13E811E81; Wed, 21 Feb 2024 11:01:02 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id C69371C060AF; Wed, 21 Feb 2024 11:01:00 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Cc: Paolo Bonzini , qemu-arm@nongnu.org, Fabiano Rosas Subject: [PATCH] hw/intc/Kconfig: Fix GIC settings when using "--without-default-devices" Date: Wed, 21 Feb 2024 12:00:59 +0100 Message-ID: <20240221110059.152665-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: ljprCRzjGTks When using "--without-default-devices", the ARM_GICV3_TCG and ARM_GIC_KVM settings currently get disabled, though the arm virt machine is only of very limited use in that case. This also causes the migration-test to fail in such builds. Let's make sure that we always keep the GIC switches enabled in the --without-default-devices builds, too. Signed-off-by: Thomas Huth --- hw/intc/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 97d550b06b..2b5b2d2301 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -12,10 +12,6 @@ config IOAPIC bool select I8259 -config ARM_GIC - bool - select MSI_NONBROKEN - config OPENPIC bool select MSI_NONBROKEN @@ -25,14 +21,18 @@ config APIC select MSI_NONBROKEN select I8259 +config ARM_GIC + bool + select ARM_GICV3_TCG if TCG + select ARM_GIC_KVM if KVM + select MSI_NONBROKEN + config ARM_GICV3_TCG bool - default y depends on ARM_GIC && TCG config ARM_GIC_KVM bool - default y depends on ARM_GIC && KVM config XICS -- 2.43.2