From nobody Mon Feb 9 17:24:42 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411292036939.9254248979033; Fri, 25 Jan 2019 02:14:52 -0800 (PST) Received: from localhost ([127.0.0.1]:41344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyVc-0005EJ-Ra for importer@patchew.org; Fri, 25 Jan 2019 05:14:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOT-0007Ky-6D for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOQ-0001YL-Pj for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:24 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOO-0001UQ-UP for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:21 -0500 Received: by mail-wr1-x441.google.com with SMTP id u4so9639519wrp.3 for ; Fri, 25 Jan 2019 02:07:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:16 -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=5AJrg63YSNg5YAyACAhVTzV/teajywyIQzTIy8u98tc=; b=RNgiV2MsjsgU115jCzt1OSfLuatWoQf+KYgpuGMZCnz9YZxY07b8y04AOh1CaLCkJo RC24n+ojGpvV0TEilFT7nyBqHcjc5O2XpXBC6ggmW+upHplVMEuahGU8X7h4f3kKxqZG cfN+KsCRbIvylIkmd31SApbiwzgjERPwZK7PKQP/2O0QwUuO73fDgMkps2/tpIZZBN0r 6ra/QD1JCZlMSSXIBPArke0TyAY4m3QNqn7Gr9d8Kldx2BBjDeIbzWeTipIv6ua6zGoa Wvzpn8A4c1HdNO30hSdwHv4nDZiAGk1WCzeK+uIhdKKQeQRcoLffylLdDfY/FkJ9OZ5X L1Ug== 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=5AJrg63YSNg5YAyACAhVTzV/teajywyIQzTIy8u98tc=; b=saReiS986r2kzs/FS0FwuKMlDXMFC93INkTQQ8Uc/xDfybF1MJUIOtQTh+/UznBg3H H5AqsLjCqa1pJOJUf8u+tHpQPbCXQrMjJt9/zWaniBr8iy8wsdOVMxw5ZBPFbaJaWNSw QNmaa+NDP+D97Vp/OD0xJGWo6TQnNS7UWdTysj7YziR4pmomYGOnFTHKaBGKpORFvOAV +ieIoDWe949hP6oJ0dDoWPJzo6TW4uC3ELH4Rj8An9sZZojhL/CSQ/+qVZZ8KsZE81Px ur9MHmj/COkuRgAVw4dfSJ4tm2BE4/1oqTSe73pGAzxKXlcOG1H+/AG600fX2ZBIn29C aQWw== X-Gm-Message-State: AJcUukfN7WL8WDrCFQAqGtl4k0nRSzVvE15XTEm5QFtQMua3I9eAkEIj QcTmESA2RMFsjco3jEmQEVPOsyyQ X-Google-Smtp-Source: ALg8bN44kTaSRMI31wKtkpb+BdhEGZc2ZnWE7mqat2IjpNmhViEfr+QFAheDi2qxqluoum1rOMDPTQ== X-Received: by 2002:adf:f649:: with SMTP id x9mr10561692wrp.247.1548410837613; Fri, 25 Jan 2019 02:07:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:23 +0100 Message-Id: <1548410831-19553-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::441 Subject: [Qemu-devel] [PATCH 04/52] 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@intel.com, thuth@redhat.com, "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 Message-Id: <20190123065618.3520-2-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 3c9351f..107f801 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -122,7 +122,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 @@ -153,7 +153,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