Message ID | 1426500498-24129-11-git-send-email-cornelia.huck@de.ibm.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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 64A091400B7 for <incoming@patchwork.ozlabs.org>; Mon, 16 Mar 2015 21:27:17 +1100 (AEDT) Received: from localhost ([::1]:48278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1YXSEt-0000DT-Cd for incoming@patchwork.ozlabs.org; Mon, 16 Mar 2015 06:27:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cornelia.huck@de.ibm.com>) id 1YXSDL-0005bq-5Y for qemu-devel@nongnu.org; Mon, 16 Mar 2015 06:25:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cornelia.huck@de.ibm.com>) id 1YXSDH-0002KA-OH for qemu-devel@nongnu.org; Mon, 16 Mar 2015 06:25:39 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:58412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <cornelia.huck@de.ibm.com>) id 1YXRwt-0004Uw-OT for qemu-devel@nongnu.org; Mon, 16 Mar 2015 06:08:39 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <qemu-devel@nongnu.org> from <cornelia.huck@de.ibm.com>; Mon, 16 Mar 2015 10:08:38 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 16 Mar 2015 10:08:36 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 547312190056 for <qemu-devel@nongnu.org>; Mon, 16 Mar 2015 10:08:26 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2GA8apG2359646 for <qemu-devel@nongnu.org>; Mon, 16 Mar 2015 10:08:36 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2GA8XkM004982 for <qemu-devel@nongnu.org>; Mon, 16 Mar 2015 04:08:35 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-143.boeblingen.de.ibm.com [9.152.224.143]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t2GA8LHY004400; Mon, 16 Mar 2015 04:08:32 -0600 From: Cornelia Huck <cornelia.huck@de.ibm.com> To: peter.maydell@linaro.org Date: Mon, 16 Mar 2015 11:08:18 +0100 Message-Id: <1426500498-24129-11-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1426500498-24129-1-git-send-email-cornelia.huck@de.ibm.com> References: <1426500498-24129-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15031610-0041-0000-0000-000003975837 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.106 Cc: Thomas Huth <thuth@linux.vnet.ibm.com>, qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Cornelia Huck <cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL for-2.3 10/10] s390x/config: Do not include full pci.mak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org |
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