Received: by 2002:a05:6512:204:0:0:0:0 with SMTP id a4csp2560335lfo; Tue, 8 Mar 2022 10:25:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3U3o1flm6PZ3I/qdhHlB9W5i6d1FW761J85EY5YUnogQzd4ticoAY/ej7sjwYTifDrF+H X-Received: by 2002:a25:3746:0:b0:628:b457:9ab with SMTP id e67-20020a253746000000b00628b45709abmr13420342yba.433.1646763944072; Tue, 08 Mar 2022 10:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646763944; cv=none; d=google.com; s=arc-20160816; b=Lq14swv9MnV4BC/3+nyhzXzq7f9XoHY8F6MLtdlaI5U7DazLVczW00hkkTcZtXf1zf rMqojQwaOs8Mirb0OJN835CV0C74g0Je8cDU71xiDf3BF6kfKhke9/udOKCFsF0paCyf S5F6i+8KZwIOi6BERSxAItLDNe1km5nvUk7riHhvtG5+DYANRf7QenDIvDmZG1+imHao mhW5BOXRBKMdd0DcMN7hFGvKOFT995zQrfzHT1Glf9m2GJhErRBY+kaJ1epfwWEnyNss k2RNoOkqwci3B8QSZf7KggtRJcaFgDN968l16HRBQATIv199cFaQfxj3sQD4y5p+U/Fp 1v/g== 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=9eHzE2Oeiv8GnAde9Vlt7vdxFQ1ZbGYXgwrANjAz7Fo=; b=vVt0sMNnSQhiuW7yZeGp1xgUThAKMHVpVzPDFGVq8m33Atz4TtTLtWlveznQfGH6pp /4uR0b5IX1ToAC4hME3diaZiqc5IHpIRm5P2m07UhtQH+zRyd3ODvPfbas7CHPP6+wFR l2jtDgve3synOLs4JxBkrgfelVCECbrxLrXHM/j7lL6UOaKzdEJoxf5UdY2Q/tiHtmMz UNwAmGd3OSlUMbmYe0nlI0BvrZBNSoEdLOUY5l5+H65BHV+pwv0oOaEVYd+h/uPAYcCK zCTGvnczNzJma2K/7/Tfka0W/zuYiWlTHL6K9JIcOgjth+YgIUYpa7zeUllsdJXfmAOP A+Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Yr/815ma"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-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 o1-20020a81ef01000000b002d6b7fe8c7fsi11326444ywm.434.2022.03.08.10.25.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Mar 2022 10:25:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-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="Yr/815ma"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:50064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nReWl-0007kj-Es for alex.bennee@linaro.org; Tue, 08 Mar 2022 13:25:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nReWB-0007Zg-IF for qemu-arm@nongnu.org; Tue, 08 Mar 2022 13:25:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nReW7-0003uZ-Gf for qemu-arm@nongnu.org; Tue, 08 Mar 2022 13:25:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646763902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9eHzE2Oeiv8GnAde9Vlt7vdxFQ1ZbGYXgwrANjAz7Fo=; b=Yr/815mabaMlPFXAvF10/SWPzJhLLSlA/FfKcsnA1xd2m6u5ZYUnTgfSU8czAmpOONCdEb 87sHJF5NWWvr6JvzHR+fUirQ1TOnsP1iNbWoyluCHWV4hY/z/0vHfHXwH4L47xgkvWtChJ 7fZwC/r+Zjbj7uCT74AhCeWqAXuEdv8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-660-fOlLW5j6MVqtDN7bLz3lTA-1; Tue, 08 Mar 2022 13:24:59 -0500 X-MC-Unique: fOlLW5j6MVqtDN7bLz3lTA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C37C1800D50; Tue, 8 Mar 2022 18:24:58 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id B902886C44; Tue, 8 Mar 2022 18:24:56 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, f4bug@amsat.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/intc: Rename CONFIG_ARM_GIC_TCG into CONFIG_ARM_GICV3_TCG Date: Tue, 8 Mar 2022 19:24:51 +0100 Message-Id: <20220308182452.223473-2-eric.auger@redhat.com> In-Reply-To: <20220308182452.223473-1-eric.auger@redhat.com> References: <20220308182452.223473-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@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.082, 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_H5=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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: tUBhquuNfdcl CONFIG_ARM_GIC_TCG actually guards the compilation of TCG GICv3 specific files. So let's rename it into CONFIG_ARM_GICV3_TCG Signed-off-by: Eric Auger --- hw/intc/Kconfig | 2 +- hw/intc/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index ec8d4cec29..a7cf301eab 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -25,7 +25,7 @@ config APIC select MSI_NONBROKEN select I8259 -config ARM_GIC_TCG +config ARM_GICV3_TCG bool default y depends on ARM_GIC && TCG diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 81ccdb0d78..d6d012fb26 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -6,7 +6,7 @@ softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( 'arm_gicv3_common.c', 'arm_gicv3_its_common.c', )) -softmmu_ss.add(when: 'CONFIG_ARM_GIC_TCG', if_true: files( +softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( 'arm_gicv3.c', 'arm_gicv3_dist.c', 'arm_gicv3_its.c', @@ -28,7 +28,7 @@ softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-iomod-in specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c')) specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c')) specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) -specific_ss.add(when: 'CONFIG_ARM_GIC_TCG', if_true: files('arm_gicv3_cpuif.c')) +specific_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) -- 2.26.3