From patchwork Thu Mar 12 14:19:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 449475 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9FC7D1400DD for ; Fri, 13 Mar 2015 01:19:59 +1100 (AEDT) Received: from localhost ([::1]:60256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW3xt-0002M3-Jd for incoming@patchwork.ozlabs.org; Thu, 12 Mar 2015 10:19:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW3xN-0001Wz-EN for qemu-devel@nongnu.org; Thu, 12 Mar 2015 10:19:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YW3xK-0002sB-8l for qemu-devel@nongnu.org; Thu, 12 Mar 2015 10:19:25 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:46399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW3xJ-0002qu-W9 for qemu-devel@nongnu.org; Thu, 12 Mar 2015 10:19:22 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Mar 2015 14:19:18 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Mar 2015 14:19:17 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 028711B08067 for ; Thu, 12 Mar 2015 14:19:38 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2CEJGvC63504534 for ; Thu, 12 Mar 2015 14:19:16 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2C9ELXl003780 for ; Thu, 12 Mar 2015 05:14:22 -0400 Received: from oc7435384737.ibm.com (sig-9-83-252-238.evts.de.ibm.com [9.83.252.238]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t2C9ELx9003739; Thu, 12 Mar 2015 05:14:21 -0400 From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 12 Mar 2015 15:19:14 +0100 Message-Id: <1426169954-6062-1-git-send-email-thuth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15031214-0029-0000-0000-000003BFECEC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.113 Cc: cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, blaschka@linux.vnet.ibm.com, agraf@suse.de, Thomas Huth Subject: [Qemu-devel] [PATCH] s390x/config: Do not include full pci.mak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- default-configs/s390x-softmmu.mak | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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