diff mbox series

[PULL,21/44] s390x: refine pci dependencies

Message ID	20170830165252.13421-22-cohuck@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7B76681E08 From: Cornelia Huck <cohuck@redhat.com> To: peter.maydell@linaro.org Date: Wed, 30 Aug 2017 18:52:29 +0200 Message-Id: <20170830165252.13421-22-cohuck@redhat.com> In-Reply-To: <20170830165252.13421-1-cohuck@redhat.com> References: <20170830165252.13421-1-cohuck@redhat.com> Subject: [Qemu-devel] [PULL 21/44] s390x: refine pci dependencies Precedence: list Cc: thuth@redhat.com, david@redhat.com, Cornelia Huck <cohuck@redhat.com>, agraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/44] s390x/css: use macro for event-information pending error recover code \| expand [PULL,01/44] s390x/css: use macro for event-information pending error recover code [PULL,02/44] s390x/css: generate solicited crw for rchp completion signaling [PULL,03/44] s390x: introduce 2.11 compat machine [PULL,04/44] s390x/ipl: The s390-ipl device is not hot-pluggable [PULL,05/44] tests/boot-sector: Do not overwrite the x86 buffer on other architectures [PULL,06/44] tests/pxe: Check virtio-net-ccw on s390x [PULL,07/44] tests: Run filter-redirector and -mirror test only on POSIX systems [PULL,08/44] tests: Add network filter tests to the check-qtest-s390x list [PULL,09/44] s390x/tcg: specification exception for unknown diag [PULL,10/44] watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable [PULL,11/44] s390x: wire up diag288 in tcg [PULL,12/44] configure: enable --s390-pgste linker option [PULL,13/44] 9pfs: fix dependencies [PULL,14/44] kvm: remove hard dependency on pci [PULL,15/44] s390x/pci: add stubs [PULL,16/44] s390x: chsc nt2 events are pci-only [PULL,17/44] s390x/pci: do not advertise pci on non-pci builds [PULL,18/44] s390x/ccw: create s390 phb conditionally [PULL,19/44] s390x/sclp: properly guard pci-specific functions [PULL,20/44] s390x/pci: fence off instructions for non-pci [PULL,21/44] s390x: refine pci dependencies [PULL,22/44] s390x/s390-skeys: Mark the storage key devices with user_creatable = false [PULL,23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count() [PULL,24/44] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit() [PULL,25/44] target/s390x: simplify ri_allowed() [PULL,26/44] target/s390x: simplify gs_allowed() [PULL,27/44] target/s390x: no need to pass kvm_state to savevm_gtod handlers [PULL,28/44] s390x/cpumodel: factor out determination of default model name [PULL,29/44] s390x: drop inclusion of sysemu/kvm.h from some files [PULL,30/44] target/s390x: move gtod_*() declarations to s390-virtio.h [PULL,31/44] target/s390x: move cc_name() to helper.c [PULL,32/44] target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c [PULL,33/44] target/s390x: move psw_key_valid() to mem_helper.c [PULL,34/44] target/s390x: move s390_do_cpu_reset() to diag.c [PULL,35/44] target/s390x: move get_per_in_range() to misc_helper.c [PULL,36/44] target/s390x: introduce internal.h [PULL,37/44] target/s390x: move a couple of functions to cpu.c [PULL,38/44] s390x: avoid calling kvm_ functions outside of target/s390x/ [PULL,39/44] s390x/kvm: move KVM declarations and stubs to separate files [PULL,40/44] target/s390x: cleanup cpu.h [PULL,41/44] s390x/s390-stattrib: Mark the storage attribute as not user_creatable [PULL,42/44] s390-ccw: Fix alignment for CCW1 [PULL,44/44] s390x/pci: fixup trap_msix()

Commit Message

Cornelia Huck Aug. 30, 2017, 4:52 p.m. UTC

VIRTIO_PCI should properly depend on CONFIG_PCI.
With this change, we can switch off pci for s390x by removing
'CONFIG_PCI=y' from the default config.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 default-configs/s390x-softmmu.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 51191b77df..6ab2bc65ac 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -1,5 +1,5 @@ 
 CONFIG_PCI=y
-CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
 CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
 CONFIG_VIRTIO=y
 CONFIG_SCLPCONSOLE=y