From patchwork Sat May 15 10:03:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1478842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fj1Wc2Yv1z9sCD for ; Sat, 15 May 2021 20:16:11 +1000 (AEST) Received: from localhost ([::1]:55940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhrL6-0005AB-Uz for incoming@patchwork.ozlabs.org; Sat, 15 May 2021 06:16:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhr9R-000667-RW; Sat, 15 May 2021 06:04:07 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhr9O-0006YS-7X; Sat, 15 May 2021 06:04:05 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N63NW-1lSOg00bE0-016Rv7; Sat, 15 May 2021 12:03:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 12/16] hw/pci-host: Do not build gpex-acpi.c if GPEX is not selected Date: Sat, 15 May 2021 12:03:31 +0200 Message-Id: <20210515100335.1245468-13-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210515100335.1245468-1-laurent@vivier.eu> References: <20210515100335.1245468-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EgN/WUvV4VTzQjZhA5mUEZiJsExSyb0cGXbJor54drZyPAHltLM TBwgjUfR2O4epHirvg4QrFlrFjTVlVIqOSQ4qp+Va5H7YZD2t1xKA9DuFzpdVV+ThaLmZAs 9BVDHPe415s4IuXl/L2i1ezCLmshEEvXkaOIWnPmgHj76brQaLs5yP+hd7B7CyMTmfRxHHE n66G2Exuk0hOJy397pmtA== X-UI-Out-Filterresults: notjunk:1;V03:K0:c+0ig8MZqzc=:5tcSisSm8VDE7AssfRhpLj y2WUv+fPT47QGWEYWRg307s72EfLjGxlvvisyXc+FfjbMlQhpNH6QwjDOEOJ7xDT1tWTfiBKx NrIRdy24RvKGttOXrp3jrpbVnmM0y5zDK6Ui4M3W9tPJFYwlADO0pV9PgHRoGMQ50RTt3aDPu fL/fSJcX2KCTaQHdJnHbFEqZT71Qzm11+PW/GAb0h/wxsXL8KhfGMAymDLIBGVZM+cH9n3NLe kl712jWdQzmwF4lYWL6DQOSp68Q76LjK/dW5TFdjxSw13UZVD1mDDI2ia6vh7FuTC0+YekX7X ycDJ8moidx/i8kUrV4sI7qUiTLxEvHefy/M61LpjxIbm8K9PTGXbhRk0r9PzinDV8oNGe2If6 B5QFpEG2e47gSAI1kvTJ1SSRz8ZTB9fJy2EmtjCsN9PA7yyuR6QwFGbOU+3MSNvTjl7yOdu85 hNMkDRNIpVi7tl/UMoARdMKGJfjnhfmUsoFfoSr5X3Y6IKhf5AECqLBJwg3/eyu4i5OyEIUli +13uBjjoHEezGZcRlSC7mU= Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since its introduction in commit 5b85eabe68f ("acpi: add acpi_dsdt_add_gpex") we build gpex-acpi.c if ACPI is selected, even if the GPEX_HOST device isn't build. Add the missing Kconfig dependency. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Gerd Hoffmann Message-Id: <20210425182124.3735214-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/pci-host/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build index 34b3538bebf6..1698d3a1920a 100644 --- a/hw/pci-host/meson.build +++ b/hw/pci-host/meson.build @@ -3,7 +3,7 @@ pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c')) pci_ss.add(when: 'CONFIG_PCI_BONITO', if_true: files('bonito.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true: files('designware.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', if_true: files('gpex.c')) -pci_ss.add(when: 'CONFIG_ACPI', if_true: files('gpex-acpi.c')) +pci_ss.add(when: ['CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', 'CONFIG_ACPI'], if_true: files('gpex-acpi.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_Q35', if_true: files('q35.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c')) pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))