From: Thomas Huth Date: Thu, 12 Mar 2015 14:19:14 +0000 (+0100) Subject: s390x/config: Do not include full pci.mak X-Git-Tag: v2.3.0-rc0~12^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be0b608a5463a834df0e19911356ae93660d3677;p=thirdparty%2Fqemu.git s390x/config: Do not include full pci.mak pci.mak includes a lot of devices - and most of them do not make sense on s390x, like USB controllers or audio cards. These devices also show up when running "qemu-system-s390x -device help" and thus could raise the hope for the users that they could use these kind of devices with qemu-system-s390x. To avoid this confusion, we should not include pci.mak and rather include the bare minimum manually instead. Signed-off-by: Thomas Huth Acked-by: Frank Blaschka Message-Id: <1426169954-6062-1-git-send-email-thuth@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck --- diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 6ee2ff89ff5..f9e13f177e6 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,4 +1,5 @@ -include pci.mak +CONFIG_PCI=y +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO=y CONFIG_SCLPCONSOLE=y CONFIG_S390_FLIC=y