From nobody Mon Feb 9 17:24:59 2026 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 1549308322113225.2466878585327; Mon, 4 Feb 2019 11:25:22 -0800 (PST) Received: from localhost ([127.0.0.1]:47975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqjro-0003kK-4G for importer@patchew.org; Mon, 04 Feb 2019 14:25:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqj7v-00064v-PS for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqj7u-0004Ei-BP for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:51 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:51435) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqj7u-00044p-2q for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:50 -0500 Received: by mail-wm1-x336.google.com with SMTP id b11so980860wmj.1 for ; Mon, 04 Feb 2019 10:37:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s132sm8836236wmf.28.2019.02.04.10.37.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:37:30 -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=elxNIzP1I4rUfSH6mYxs4mcBB9rKG98r2wmmPSf8QPQ=; b=lnfw/16qQkjOPA9eYsBNJlnYc08EkcAzsDXP5ArC5H1daBx0hWlcVYL2xOC8RMn8RR ozTI/ydNYAa9TXW2c7Oty96WOInWNq+oz/eFOOd0+5ay/1EZdCiNxpZLCRumATanS/iu xnply4y0WBw+V+TzOo8SnzwAn6TLoiGGtvsaBGiTM47Uj/bgKJB4FS5O8foL4uQxES+q MdbCGI8Cdu1BR9Kctgq9wfqTM38OsbX8tP9SlW8AEvHN8fpu/jfTog79aqTB++txBI2z RqtXfZlWp8lRQ3dsY8vgK5TK6NGUVWwj+/cT2PXGW/U6LDPYBupjmwMscixDreEoHfzh /9PA== 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=elxNIzP1I4rUfSH6mYxs4mcBB9rKG98r2wmmPSf8QPQ=; b=GQqI66leWSBKbLbVnIEluR3xmzy3+aePMU/v9MY56jFGuKouqrtHGan1i/VCUusA9H sVTUfVc8VhTlmwWss347r35bJ8sBdU4SXJrkpG0V/uiABl5lDk5cF4XrWlq+Vs3GI70R n0NBU4ElwssnFKwH6PX2+em/y6BwI7OCMbEnqYmO8ZAEnJT7TP3M1Siu9mkhaJ0ru1+k 7/UJLxLEGYg0i1Hep9jxh61dq4KajBDycXMGZ2YvFB0iCWkr6vIKqA/2Z4CjK3u/zOGB PXTRiZYFZ+nhPbhWRyGHv5OaSsu+O6ZuJ8RifFlhgzYCwdphs0N3f5a6m1+1ey02M6Y2 IobA== X-Gm-Message-State: AHQUAuZvZdVuD47iObDa5hDrmhjgu+QvzqST+fDAoVW7Io2vRtUSw3t0 VDPp3FfvJnUV6ahd4Maopjhpj4yK X-Google-Smtp-Source: AHgI3IYN7R5DqlipRIyF3hfxkdDq4BI1GqSEJFn2dlgiC5K2bIjF8uFagmluZIABEgN3f1g77xuobg== X-Received: by 2002:a1c:f112:: with SMTP id p18mr526955wmh.83.1549305451590; Mon, 04 Feb 2019 10:37:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:36:14 +0100 Message-Id: <1549305379-51117-73-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-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::336 Subject: [Qemu-devel] [PULL 72/77] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI 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+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" Make hw/vfio configurable and add new CONFIG_VFIO_* to the default-configs/s390x*-softmmu.mak. This allow a finer-grain selection of the various VFIO backends. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190202072456.6468-28-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 2 ++ default-configs/pci.mak | 2 ++ default-configs/s390x-softmmu.mak | 5 +++-- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 7 +++---- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index d700d09..734ca72 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -124,6 +124,8 @@ CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy +CONFIG_VFIO=3D$(CONFIG_LINUX) +CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 83738cb..037636f 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -47,3 +47,5 @@ CONFIG_VGA_PCI=3Dy CONFIG_BOCHS_DISPLAY=3Dy CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy +CONFIG_VFIO=3D$(CONFIG_LINUX) +CONFIG_VFIO_PCI=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 8bb7e43..6f2c6ce 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -5,7 +5,8 @@ CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy CONFIG_S390_FLIC_KVM=3D$(CONFIG_KVM) -CONFIG_VFIO_CCW=3D$(CONFIG_LINUX) CONFIG_WDT_DIAG288=3Dy -CONFIG_VFIO_AP=3D$(CONFIG_LINUX) CONFIG_S390_CCW_VIRTIO=3Dy +CONFIG_VFIO=3D$(CONFIG_LINUX) +CONFIG_VFIO_CCW=3Dy +CONFIG_VFIO_AP=3Dy diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 22dd211..e2fcd6a 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D ssi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-$(CONFIG_SOFTMMU) +=3D usb/ -devices-dirs-$(CONFIG_LINUX) +=3D vfio/ +devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-$(CONFIG_SOFTMMU) +=3D virtio/ devices-dirs-$(CONFIG_SOFTMMU) +=3D watchdog/ devices-dirs-$(CONFIG_SOFTMMU) +=3D xen/ diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index 9180589..abad8b8 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -1,8 +1,7 @@ -obj-$(CONFIG_SOFTMMU) +=3D common.o -obj-$(CONFIG_PCI) +=3D pci.o pci-quirks.o display.o +obj-y +=3D common.o spapr.o +obj-$(CONFIG_VFIO_PCI) +=3D pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) +=3D ccw.o -obj-$(CONFIG_SOFTMMU) +=3D platform.o +obj-$(CONFIG_VFIO_PLATFORM) +=3D platform.o obj-$(CONFIG_VFIO_XGMAC) +=3D calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) +=3D amd-xgbe.o -obj-$(CONFIG_SOFTMMU) +=3D spapr.o obj-$(CONFIG_VFIO_AP) +=3D ap.o --=20 1.8.3.1