From nobody Mon Feb 9 16:53:06 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 1548412300225555.4270759317802; Fri, 25 Jan 2019 02:31:40 -0800 (PST) Received: from localhost ([127.0.0.1]:41603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmylp-00013v-Ti for importer@patchew.org; Fri, 25 Jan 2019 05:31:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007dJ-Vv for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001r8-MK for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001nf-AH for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x344.google.com with SMTP id n190so6176459wmd.0 for ; Fri, 25 Jan 2019 02:07:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:39 -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=4V0NZkdJf0K7ARIk4OH+z7tTxzzfBdLAD5lC8BqqjSc=; b=g5OMPy1UnJ0PzRMB8FOgHL60wguHm1EN0NkmOJG6xAgWSgUaMt++Bid+6lqHcw1ggB +da3l1OA4litiC+vXJ2bemAY2o9//5CalDD/UxqHaiNruaCHZKnM9h0DmOtCehv+zVAs GgoDx/I5xORehCiEpDhbt/mMNvEmuQS8SQJX5rpe/+bsjqMfu1WlBJADZiJg2gnZ/24I 5SMYYhrPjnuN3gCKIx+QCRUK6YY1qwIZCgzpBdzMp760nJCZS33GRAh85lBfL8IGOMan KrBST7EmM2Yuh9SEE7iJNKLMikDc/gQgWRbekh62YZ3Oo4Ndl1wGQdGROi7Sx8ka/688 RhoA== 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=4V0NZkdJf0K7ARIk4OH+z7tTxzzfBdLAD5lC8BqqjSc=; b=KmxTcqCX9iIHuD+sNqTHGOSxXoKgfBFTj88l9JdNabWuLnIGTUeKCbzTER6qQxi9tS rj9rHZsk2yeDbAOnOCilQaugx5r+wF1QXU9rrhzEKLnJ/UKXeBFx6s46MoDSGe7XHqaM zCRdZAV05E2ow68Zj5lMUfK6wAvw3PGe8OOnJbYKPI0rLLqi9pewx0YADQk2wd8zS+vC BOryFqncHSegnop+YF6N/7lDg83cGYlmuCgxp3BnuWjnsFWo/+3sNCm1iJ8z3T37bOBq /33agh2l9MNKIWQ5skgNg4/O9JMKzcAzTQU7Ap8hxKnkHVPcGdlpmQWh+SU16YjU2KsR GvEw== X-Gm-Message-State: AJcUukdjPi5/h0qlwFABj7dL1CcKphToo/TMbB4iYt2cl+B4qnxzQfKH TaM2Qpl50HtmSZh1tpyLlkf41eHl X-Google-Smtp-Source: ALg8bN5ESYU9y2lvvNLoK7I3feKJEJIVKLdeyi1aktVpT5OqD7157D3KSi5/1GCPLuKsuhEmri6JwQ== X-Received: by 2002:a1c:4c0c:: with SMTP id z12mr5886951wmf.17.1548410860262; Fri, 25 Jan 2019 02:07:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:46 +0100 Message-Id: <1548410831-19553-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::344 Subject: [Qemu-devel] [PATCH 27/52] 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: , Cc: yang.zhong@intel.com, thuth@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" 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 Message-Id: <20190123065618.3520-10-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 2 ++ default-configs/pci.mak | 2 ++ default-configs/ppc64-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 5 +++-- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 7 +++---- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index caf7d7e..4f0ecba 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -123,6 +123,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/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index 7f34ad0..ccd7b17 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -18,6 +18,7 @@ CONFIG_XICS_SPAPR=3D$(CONFIG_PSERIES) CONFIG_XICS_KVM=3D$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) CONFIG_XIVE=3D$(CONFIG_PSERIES) CONFIG_XIVE_SPAPR=3D$(CONFIG_PSERIES) +CONFIG_VFIO_SPAPR=3D$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_SPAPR_RNG=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