From: Cornelia Huck <cohuck@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, rth@twiddle.net, agraf@suse.de,
thuth@redhat.com, borntraeger@de.ibm.com, david@redhat.com,
Cornelia Huck <cohuck@redhat.com>
Subject: [Qemu-devel] [PULL 21/44] s390x: refine pci dependencies
Date: Wed, 30 Aug 2017 18:52:29 +0200 [thread overview]
Message-ID: <20170830165252.13421-22-cohuck@redhat.com> (raw)
In-Reply-To: <20170830165252.13421-1-cohuck@redhat.com>
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 --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
--
2.13.5
next prev parent reply other threads:[~2017-08-30 16:54 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 16:52 [Qemu-devel] [PULL 00/44] first batch of s390x patches for 2.11 Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 01/44] s390x/css: use macro for event-information pending error recover code Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 02/44] s390x/css: generate solicited crw for rchp completion signaling Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 03/44] s390x: introduce 2.11 compat machine Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 04/44] s390x/ipl: The s390-ipl device is not hot-pluggable Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 05/44] tests/boot-sector: Do not overwrite the x86 buffer on other architectures Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 06/44] tests/pxe: Check virtio-net-ccw on s390x Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 07/44] tests: Run filter-redirector and -mirror test only on POSIX systems Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 08/44] tests: Add network filter tests to the check-qtest-s390x list Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 09/44] s390x/tcg: specification exception for unknown diag Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 10/44] watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 11/44] s390x: wire up diag288 in tcg Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 12/44] configure: enable --s390-pgste linker option Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 13/44] 9pfs: fix dependencies Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 14/44] kvm: remove hard dependency on pci Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 15/44] s390x/pci: add stubs Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 16/44] s390x: chsc nt2 events are pci-only Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 17/44] s390x/pci: do not advertise pci on non-pci builds Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 18/44] s390x/ccw: create s390 phb conditionally Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 19/44] s390x/sclp: properly guard pci-specific functions Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 20/44] s390x/pci: fence off instructions for non-pci Cornelia Huck
2017-08-30 16:52 ` Cornelia Huck [this message]
2017-08-30 16:52 ` [Qemu-devel] [PULL 22/44] s390x/s390-skeys: Mark the storage key devices with user_creatable = false Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count() Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 24/44] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit() Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 25/44] target/s390x: simplify ri_allowed() Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 26/44] target/s390x: simplify gs_allowed() Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 27/44] target/s390x: no need to pass kvm_state to savevm_gtod handlers Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 28/44] s390x/cpumodel: factor out determination of default model name Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 29/44] s390x: drop inclusion of sysemu/kvm.h from some files Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 30/44] target/s390x: move gtod_*() declarations to s390-virtio.h Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 31/44] target/s390x: move cc_name() to helper.c Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 32/44] target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 33/44] target/s390x: move psw_key_valid() to mem_helper.c Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 34/44] target/s390x: move s390_do_cpu_reset() to diag.c Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 35/44] target/s390x: move get_per_in_range() to misc_helper.c Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 36/44] target/s390x: introduce internal.h Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 37/44] target/s390x: move a couple of functions to cpu.c Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 38/44] s390x: avoid calling kvm_ functions outside of target/s390x/ Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 39/44] s390x/kvm: move KVM declarations and stubs to separate files Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 40/44] target/s390x: cleanup cpu.h Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 41/44] s390x/s390-stattrib: Mark the storage attribute as not user_creatable Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 42/44] s390-ccw: Fix alignment for CCW1 Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 43/44] pc-bios/s390-ccw.img: update image Cornelia Huck
2017-08-30 16:52 ` [Qemu-devel] [PULL 44/44] s390x/pci: fixup trap_msix() Cornelia Huck
2017-08-31 12:50 ` [Qemu-devel] [PULL 00/44] first batch of s390x patches for 2.11 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170830165252.13421-22-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).