From nobody Fri Dec 19 07:47:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564052383997.1151873261067; Thu, 7 Feb 2019 10:27:32 -0800 (PST) Received: from localhost ([127.0.0.1]:44861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groOU-0008Kt-7V for importer@patchew.org; Thu, 07 Feb 2019 13:27:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwi-0002hP-Se for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwZ-0002cf-8L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:38 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwX-0002W3-8N for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:33 -0500 Received: by mail-wm1-x343.google.com with SMTP id m1so823375wml.2 for ; Thu, 07 Feb 2019 09:58:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UxIbYR3qRi6d6G3qcmZ58+AzdEFmlQ7XRWd7QuZgye0=; b=vESq7PZisdvsGmimmaSsffhGHbXpvX6JHK3YHPpwoDQc63t2f2HBmxJ9F9P195FYK5 hyaCbKZ5t+Kjz4jSbCYCdXrbHXuPJ3yN7brZtGlJMcaM8wbUKempx3XPDfrF3SlGku0i YM1waTmU1zTrNTzNdTo5SUDrbCaam6wiawj8FDhSDv947V104m4vgXfSPli10l01g4vy 5e1Jiq1WGcyS0Hjqzcb6mFGa4yeY2c7gpA24Wg98PfyVceS7OOapjwI07CI4GOHGwCAV 8PSF9VhVBlMutsXGGOSn9GxDr91qbwkUoO6szujoFdr6Ka41H1CWOYVpDpRr+SPStkEr tjaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UxIbYR3qRi6d6G3qcmZ58+AzdEFmlQ7XRWd7QuZgye0=; b=XtTIjwFDBM87seit4ciB0xG3BwsvKCfkbSyPbcPUfYs5H7ZPHWwlYzgR7vY+J4clxC GF/byQhR4xmEIRL6hPf/HZIxPGw6cmlI8IRFjiUHx5FO/BjsHeeXR8ZlJTw92uJMsyD0 g1+vQ54zdkV79LfHfGV7+wnErXxvr69e6JzOdlCMBFd6Q3xiUwbiaDeClj89a51tZOCM nM56yYajoX77ZQKnjONJjhorB8eRI9G1W0G4tHw9OnAE91N038aFPQjdOm89UPnX8i9Q Ezj8ZO180yFR8qW4hqZnyJStEQalDEbuoWBxnVw1h4P7+NL6gLb1v1W38j3Ml3VHQwJd f1PQ== X-Gm-Message-State: AHQUAuYDCzCuiCQRi6Obgedp3Pf7tBlfLntTVUK/eQzHmEU12FhqjOHX ya65iM/V5QNoPV3qpAmtXao3kFg/ X-Google-Smtp-Source: AHgI3IbvJ9JmZUtlJnTvXLKlWEQxK+xe+FNgwjFh9JLKbUDOU+vqc/HDzAEW7pIsOv9pRO9nUrHPcQ== X-Received: by 2002:a1c:a4c4:: with SMTP id n187mr8440121wme.15.1549562300905; Thu, 07 Feb 2019 09:58:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:27 +0100 Message-Id: <1549562254-41157-45-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 44/51] 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: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth 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 Acked-by: Cornelia Huck Signed-off-by: Paolo Bonzini --- default-configs/s390x-softmmu.mak | 20 ++++++++++++-------- hw/s390x/Kconfig | 9 +++++++++ hw/s390x/Makefile.objs | 4 +++- hw/virtio/Kconfig | 4 ++++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2be5059..f2287a1 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,9 +1,13 @@ -CONFIG_PCI=3Dy -CONFIG_VIRTIO_PCI=3Dy -CONFIG_SCLPCONSOLE=3Dy -CONFIG_TERMINAL3270=3Dy -CONFIG_S390_FLIC=3Dy -CONFIG_WDT_DIAG288=3Dy +# Default configuration for s390x-softmmu + +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TERMINAL3270=3Dn +#CONFIG_VFIO_AP=3Dn +#CONFIG_VFIO_CCW=3Dn +#CONFIG_VIRTIO_PCI=3Dn +#CONFIG_WDT_DIAG288=3Dn + +# Boards: +# CONFIG_S390_CCW_VIRTIO=3Dy -CONFIG_VFIO_CCW=3Dy -CONFIG_VFIO_AP=3Dy diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index 303db7f..a7046ea 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -1,2 +1,11 @@ config S390_CCW_VIRTIO bool + imply VIRTIO_PCI + imply TERMINAL3270 + imply VFIO_AP + imply VFIO_CCW + imply WDT_DIAG288 + select PCI + select S390_FLIC + select SCLPCONSOLE + select VIRTIO_CCW diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index a18c471..9884979 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -6,7 +6,8 @@ obj-y +=3D sclpcpu.o obj-y +=3D ipl.o obj-y +=3D css.o obj-$(CONFIG_S390_CCW_VIRTIO) +=3D s390-virtio-ccw.o -obj-y +=3D 3270-ccw.o +obj-$(CONFIG_TERMINAL3270) +=3D 3270-ccw.o +ifeq ($(CONFIG_VIRTIO_CCW),y) obj-y +=3D virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-ccw-serial.o obj-$(CONFIG_VIRTIO_BALLOON) +=3D virtio-ccw-balloon.o @@ -19,6 +20,7 @@ obj-$(CONFIG_VIRTIO_NET) +=3D virtio-ccw-net.o obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-ccw-blk.o obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) +=3D virtio-ccw-9p.o obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock-ccw.o +endif obj-y +=3D css-bridge.o obj-y +=3D ccw-device.o obj-$(CONFIG_PCI) +=3D s390-pci-bus.o s390-pci-inst.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 =20 +config VIRTIO_CCW + bool + select VIRTIO + config VIRTIO_BALLOON bool default y --=20 1.8.3.1