From patchwork Mon Jan 28 15:29:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1031985 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43pD8W070hz9sBZ for ; Tue, 29 Jan 2019 02:30:03 +1100 (AEDT) Received: from localhost ([127.0.0.1]:33776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go8rJ-0004BH-3V for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2019 10:30:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go8qz-0004B6-51 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:29:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go8qy-0000gC-8f for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:29:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53038) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1go8qy-0000UD-1r; Mon, 28 Jan 2019 10:29:40 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A451356C4; Mon, 28 Jan 2019 15:29:30 +0000 (UTC) Received: from thuth.com (ovpn-116-122.ams2.redhat.com [10.36.116.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id E05026295C; Mon, 28 Jan 2019 15:29:28 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, yang.zhong@intel.com Date: Mon, 28 Jan 2019 16:29:26 +0100 Message-Id: <1548689366-31916-1-git-send-email-thuth@redhat.com> In-Reply-To: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 28 Jan 2019 15:29:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] s390x: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instead of hard-coding all config switches in the config file default-configs/s390x-softmmu.mak, let's use the new Kconfig files to express the necessary dependencies: The S390_CCW_VIRTIO config switch for the "s390-ccw-virtio" machine now selects all non-optional devices. And since we already have the VIRTIO_PCI and VIRTIO_MMIO config switches for the other two virtio transports, this patch also introduces a new config switch VIRTIO_CCW for the third, s390x-specific virtio transport, so that all three virtio transports are now handled in the same way. Signed-off-by: Thomas Huth --- This goes on top of the curren Kconfig series: Based-on: 1548410831-19553-1-git-send-email-pbonzini@redhat.com default-configs/s390x-softmmu.mak | 12 ++++++++---- hw/s390x/Kconfig | 4 ++++ hw/s390x/Makefile.objs | 2 +- hw/virtio/Kconfig | 4 ++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 2be5059..08b1683 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,9 +1,13 @@ -CONFIG_PCI=y +# Default configuration for s390x-softmmu + +# Optional devices: +# CONFIG_VIRTIO_PCI=y -CONFIG_SCLPCONSOLE=y CONFIG_TERMINAL3270=y -CONFIG_S390_FLIC=y CONFIG_WDT_DIAG288=y -CONFIG_S390_CCW_VIRTIO=y CONFIG_VFIO_CCW=y CONFIG_VFIO_AP=y + +# Boards: +# +CONFIG_S390_CCW_VIRTIO=y diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index 303db7f..9a36c39 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -1,2 +1,6 @@ config S390_CCW_VIRTIO bool + select PCI + select S390_FLIC + select SCLPCONSOLE + select VIRTIO_CCW diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index a884aae..0dc798a 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -8,7 +8,7 @@ obj-y += ipl.o obj-y += css.o obj-y += s390-virtio-ccw.o obj-y += 3270-ccw.o -obj-y += virtio-ccw.o +obj-$(CONFIG_VIRTIO_CCW) += virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio-ccw-balloon.o obj-$(CONFIG_VIRTIO_SCSI) += virtio-ccw-scsi.o diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 74f4573..e0452de 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -16,6 +16,10 @@ config VIRTIO_MMIO bool select VIRTIO +config VIRTIO_CCW + bool + select VIRTIO + config VIRTIO_BALLOON bool default y