From: Yang Zhong <yang.zhong@intel.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, thuth@redhat.com, yang.zhong@intel.com
Subject: [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI
Date: Thu, 31 Jan 2019 15:32:34 +0800 [thread overview]
Message-ID: <20190131073234.18037-28-yang.zhong@intel.com> (raw)
In-Reply-To: <20190131073234.18037-1-yang.zhong@intel.com>
From: Paolo Bonzini <pbonzini@redhat.com>
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 <pbonzini@redhat.com>
---
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 d2c8b52f6d..e74b994f2a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -123,6 +123,8 @@ CONFIG_VERSATILE_PCI=y
CONFIG_VERSATILE_I2C=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
+CONFIG_VFIO=$(CONFIG_LINUX)
+CONFIG_VFIO_PLATFORM=y
CONFIG_VFIO_XGMAC=y
CONFIG_VFIO_AMD_XGBE=y
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 83738cbb65..037636fa33 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -47,3 +47,5 @@ CONFIG_VGA_PCI=y
CONFIG_BOCHS_DISPLAY=y
CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
CONFIG_ROCKER=y
+CONFIG_VFIO=$(CONFIG_LINUX)
+CONFIG_VFIO_PCI=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 7f34ad0528..ccd7b179df 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -18,6 +18,7 @@ CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))
CONFIG_XIVE=$(CONFIG_PSERIES)
CONFIG_XIVE_SPAPR=$(CONFIG_PSERIES)
+CONFIG_VFIO_SPAPR=$(CONFIG_PSERIES)
CONFIG_MEM_DEVICE=y
CONFIG_DIMM=y
CONFIG_SPAPR_RNG=y
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 8bb7e438c8..6f2c6cec18 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -5,7 +5,8 @@ CONFIG_SCLPCONSOLE=y
CONFIG_TERMINAL3270=y
CONFIG_S390_FLIC=y
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
+CONFIG_VFIO=$(CONFIG_LINUX)
+CONFIG_VFIO_CCW=y
+CONFIG_VFIO_AP=y
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 22dd211363..e2fcd6aafc 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/
devices-dirs-$(CONFIG_SOFTMMU) += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/
-devices-dirs-$(CONFIG_LINUX) += vfio/
+devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index 91805893f7..abad8b818c 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -1,8 +1,7 @@
-obj-$(CONFIG_SOFTMMU) += common.o
-obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o
+obj-y += common.o spapr.o
+obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o
obj-$(CONFIG_VFIO_CCW) += ccw.o
-obj-$(CONFIG_SOFTMMU) += platform.o
+obj-$(CONFIG_VFIO_PLATFORM) += platform.o
obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
-obj-$(CONFIG_SOFTMMU) += spapr.o
obj-$(CONFIG_VFIO_AP) += ap.o
--
2.17.1
next prev parent reply other threads:[~2019-01-31 7:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 01/27] arm: disable CONFIG_SERIAL_ISA Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 02/27] ide: split ioport registration to a separate file Yang Zhong
2019-01-31 7:50 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 03/27] vfio: move conditional up to hw/Makefile.objs Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS Yang Zhong
2019-01-31 8:33 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 05/27] build: actually use CONFIG_PAM Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 06/27] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Yang Zhong
2019-01-31 8:36 ` Thomas Huth
2019-01-31 8:40 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 08/27] hw/m68k/Makefile.objs: Conditionally build boards Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 09/27] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 10/27] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 12/27] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices Yang Zhong
2019-01-31 8:39 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 14/27] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 15/27] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 16/27] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 17/27] hw/nios2/Makefile.objs: Conditionally build nios2 Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Yang Zhong
2019-01-31 8:41 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 19/27] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 20/27] hw/alpha/Makefile.objs: Create CONFIG_* for alpha Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 21/27] hw/cris/Makefile.objs: Create CONFIG_* for cris Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 22/27] hw/hppa/Makefile.objs: Create CONFIG_* for hppa Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 23/27] hw/moxie/Makefile.objs: Conditionally build moxie Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 24/27] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 25/27] hw/tricore/Makefile.objs: Create CONFIG_* for tricore Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 26/27] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller Yang Zhong
2019-01-31 7:32 ` Yang Zhong [this message]
2019-01-31 8:48 ` [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI Thomas Huth
2019-02-02 6:59 ` Yang Zhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190131073234.18037-28-yang.zhong@intel.com \
--to=yang.zhong@intel.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).