diff mbox

s390x/config: Do not include full pci.mak

Message ID 1426169954-6062-1-git-send-email-thuth@linux.vnet.ibm.com
State New
Headers show

Commit Message

Thomas Huth March 12, 2015, 2:19 p.m. UTC 
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 <thuth@linux.vnet.ibm.com>
Acked-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
---
 default-configs/s390x-softmmu.mak |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Comments

Cornelia Huck March 13, 2015, 10:13 a.m. UTC | #1 
On Thu, 12 Mar 2015 15:19:14 +0100
Thomas Huth <thuth@linux.vnet.ibm.com> wrote:

> 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 <thuth@linux.vnet.ibm.com>
> Acked-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
> ---
>  default-configs/s390x-softmmu.mak |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 

Applied to my s390-next branch.
diff mbox

Patch

diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 6ee2ff8..f9e13f1 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