From patchwork Tue Feb 5 18:15:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1037083 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RbDg0XZD"; dkim-atps=neutral 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 43vDWK2mVkz9s7T for ; Wed, 6 Feb 2019 06:03:41 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr60R-0007jq-CW for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2019 14:03:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5Gz-00030l-2z for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5Gp-0004LG-MT for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:34 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:56145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5Gn-0004J5-Cb for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:30 -0500 Received: by mail-wm1-x32c.google.com with SMTP id y139so4641385wmc.5 for ; Tue, 05 Feb 2019 10:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=j/kPztzBFo8ImMIXJt6uf6/HYnuU5ztEoP5Il6Yu9fI=; b=RbDg0XZDhdVY+NdsaXcSyaUPxDjpMej9j9Jmc8F0LUzPRFK8Vge5Dx3UhLhR9zJNaQ Qrcs3I1NPUl+lvtpWOdsB+MINXClvwiB6A6bbpVAu2YfqEkOKKVm6yGpm0Y/kMe5hDsw yh5cryScAGW+AYEMCkdHBIMBwczBWuTXYYYIlXhufeSDh/bmPPsPZnMQXBTjNu896UO/ wDO8CCNa/PKgTNUqPNmosAuT34v/p3ZIWKIqEKQAAdZxFGMBXN5p6qLBOKOR1hJ35YWp PXWYoyXRQV1ce6/lJzG89nvxGgbON299Xo6hFjYSF2GFE/oAf2X5J9CWTQ9zfoRw8ssp 91Fg== 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:subject:date:message-id :in-reply-to:references; bh=j/kPztzBFo8ImMIXJt6uf6/HYnuU5ztEoP5Il6Yu9fI=; b=OD0H+ky7Cb3J30NElRVcKLoyb9qQB9c4NuOwJIaV9ZjDBmd1ar6o4ImsFywSU9uzki BaIy4jdRc/t80z1L7hJ1z6DYxebBtKBSh+i0MDLUSUpShf4C05OVIC/vrc3LISbJZRSZ OBUMW9XpGOu4DF/+KIqMExtjkaZVsKAAoiJX9gG7h48oTv9yIEuK0Dz2GpbNT9aTe9cS pwVcKs2b/A6VLCXxdTcK/Ce1rS9s0XoZBE234gQuNmv997qS5ElahApw2mgvZ9F+e9GZ cQWgNl/hOKKlKlmHYM6M6X1jNuLJhypQs1VFtp93bYcz1JUl4P39ehXJ/HKQxPBkPRf6 7EfQ== X-Gm-Message-State: AHQUAuZcrhog2LMX9ooomGbJJz8Pj6AZmRr1Z6XWZndukRi/ViLivK7E UNPyGbbXdawoHajW6/YVSYeBC+/W X-Google-Smtp-Source: AHgI3IbuudcdbX3APAe2X/5bbXHjBQJWO629Ap0xpsMKHUt+rOezz2UIfirNHx8ttGq0jAcgspUwHg== X-Received: by 2002:a1c:2501:: with SMTP id l1mr19646wml.102.1549390587829; Tue, 05 Feb 2019 10:16:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:15:07 +0100 Message-Id: <1549390526-24246-58-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-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::32c Subject: [Qemu-devel] [PULL 57/76] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Make hw/s390x configurable and add new CONFIG_* to the default-configs/s390x*-softmmu.mak. This will be used to enable/disable vfio-ccw. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190202072456.6468-14-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/s390x-softmmu.mak | 1 + hw/s390x/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 5eef375..8bb7e43 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y CONFIG_VFIO_AP=$(CONFIG_LINUX) +CONFIG_S390_CCW_VIRTIO=y diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index ca68806..a18c471 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -5,7 +5,7 @@ obj-y += sclpquiesce.o obj-y += sclpcpu.o obj-y += ipl.o obj-y += css.o -obj-y += s390-virtio-ccw.o +obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o obj-y += 3270-ccw.o obj-y += virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o