From nobody Tue Feb 10 10:55:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549393186924424.40174914243516; Tue, 5 Feb 2019 10:59:46 -0800 (PST) Received: from localhost ([127.0.0.1]:37975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5wa-0004h7-Qt for importer@patchew.org; Tue, 05 Feb 2019 13:59:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5Gh-0002gu-IQ for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5Gf-0004CO-6a for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:23 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44634) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5Ge-0004B5-Vc for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:21 -0500 Received: by mail-wr1-x435.google.com with SMTP id v16so2846812wrn.11 for ; Tue, 05 Feb 2019 10:16:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=q5P0ht8B7A81Us2nnZ6Afm4zreSYVhr2EL8Qjqi7eUg=; b=gJ77MT024yjjKmTGk4yVfXKlF2e46K+ome8dm49vzaf5mxGxxlrSkJ3V21BszE2Rwp /caknJE3Z1M6dInj/Kzp/JIMoegNsKdHIrw/JI19guVX1AUABAaNVWlI5AKMTNs5Kenv 3jYc59KF7YNiNrKF9lsRJI8GKrtZ/MjC1YUhDo22jYbW4MZPDYR1EpI5VC0z/9m4tdOS fmXEj1xlGrdagljSWf6ArCyoCdoeSpQgt9WmzjtkDe53z8VLmWql14JGCJ/B2cZWi0st KTt9sE4Bnv9Pmgdh3CjUGIOlPuySLV2ojSX2OS3nSafSXfjlYzgR5l+fjMa71dfoK/3b S/rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=q5P0ht8B7A81Us2nnZ6Afm4zreSYVhr2EL8Qjqi7eUg=; b=XHg3IxVfNzOtk5xPT/E0Iontile9dDDzYBiPGurf2Jmor418Wa8Iq+IUCt+dtOP8Ou Mh/R7ltouvv/vwA+VvgAxf45347NlIjBxp6KCHjmZ1xys/bkDBlLI9/GwxejTs5YqOu/ Po88T6zIEWpOFW9oZ3qGp5aFo4FtZk7gLWmLBhQbRaHp0am5Sp6u4EYC/2o4+CprROmc bXoP853ERRGgSTEZ1O79KCWjMhomkbniTCqxS4krTjvZx2GlaM8Q1YlCURYwAzSjNEcT KJkAVLPzZyCVXslOwb0ux51eLHACUl5+FNvwr7DcKBPNkzGjO/uUEaW0W4EVLbgxkOqD FEfw== X-Gm-Message-State: AHQUAuZkdqj4R0LIDJmIASKiXlOrnMHg7iaW89JiE5IxYtBOSrBhxpJP OVzDFj8Fe65wOhAneUiX/aeUEBEH X-Google-Smtp-Source: AHgI3IbpShBPMXBlPL7Pd3MXcROQru5i1cOt9AcEyb9s2HRSbO8b0QJTuM1NnBnwRmCp5aT02vuUTA== X-Received: by 2002:adf:f1c5:: with SMTP id z5mr4767708wro.118.1549390579569; Tue, 05 Feb 2019 10:16:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:14:58 +0100 Message-Id: <1549390526-24246-49-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PULL 48/76] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Change the CONFIGs for PCI EXPRESS and make module name more clear for code files. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190202072456.6468-5-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 4 ++-- default-configs/i386-softmmu.mak | 2 +- default-configs/mips64el-softmmu.mak | 2 +- default-configs/pci.mak | 2 +- default-configs/riscv32-softmmu.mak | 2 +- default-configs/riscv64-softmmu.mak | 2 +- hw/net/Makefile.objs | 4 ++-- hw/pci-host/Makefile.objs | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index d7b540c..32f4a4a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -123,7 +123,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 @@ -154,7 +154,7 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_XILINX_AXI=3Dy -CONFIG_PCI_DESIGNWARE=3Dy +CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 64c998c..2f919df 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -47,7 +47,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy -CONFIG_PCI_Q35=3Dy +CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy CONFIG_PVPANIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index c2ae313..9eb1208 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,4 @@ CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy -CONFIG_PCI_XILINX=3Dy +CONFIG_PCI_EXPRESS_XILINX=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 6c7be12..83738cb 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -22,7 +22,7 @@ CONFIG_MEGASAS_SCSI_PCI=3Dy CONFIG_MPTSAS_SCSI_PCI=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI=3Dy +CONFIG_E1000E_PCI_EXPRESS=3Dy CONFIG_IDE_CORE=3Dy CONFIG_IDE_QDEV=3Dy CONFIG_IDE_PCI=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index c9c5971..fbfd1d4 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index c9c5971..fbfd1d4 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index fa461d4..a43351a 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -7,8 +7,8 @@ common-obj-$(CONFIG_EEPRO100_PCI) +=3D eepro100.o common-obj-$(CONFIG_PCNET_PCI) +=3D pcnet-pci.o common-obj-$(CONFIG_PCNET_COMMON) +=3D pcnet.o common-obj-$(CONFIG_E1000_PCI) +=3D e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI) +=3D e1000e.o e1000e_core.o e1000x_common.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D net_tx_pkt.o net_rx_pkt.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D e1000e.o e1000e_core.o e1000x= _common.o common-obj-$(CONFIG_RTL8139_PCI) +=3D rtl8139.o common-obj-$(CONFIG_VMXNET3_PCI) +=3D net_tx_pkt.o net_rx_pkt.o common-obj-$(CONFIG_VMXNET3_PCI) +=3D vmxnet3.o diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 6d6597c..073d512 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -14,8 +14,8 @@ common-obj-$(CONFIG_VERSATILE_PCI) +=3D versatile.o common-obj-$(CONFIG_PCI_SABRE) +=3D sabre.o common-obj-$(CONFIG_FULONG) +=3D bonito.o common-obj-$(CONFIG_PCI_PIIX) +=3D piix.o -common-obj-$(CONFIG_PCI_Q35) +=3D q35.o -common-obj-$(CONFIG_PCI_GENERIC) +=3D gpex.o -common-obj-$(CONFIG_PCI_XILINX) +=3D xilinx-pcie.o +common-obj-$(CONFIG_PCI_EXPRESS_Q35) +=3D q35.o +common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) +=3D gpex.o +common-obj-$(CONFIG_PCI_EXPRESS_XILINX) +=3D xilinx-pcie.o =20 -common-obj-$(CONFIG_PCI_DESIGNWARE) +=3D designware.o +common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) +=3D designware.o --=20 1.8.3.1