[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 27/52] hw/vfio/Makefile.objs: Create new CONFIG_* va
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 27/52] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI |
Date: |
Fri, 25 Jan 2019 11:06:46 +0100 |
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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=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 83738cb..037636f 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 7f34ad0..ccd7b17 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 8bb7e43..6f2c6ce 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 22dd211..e2fcd6a 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 9180589..abad8b8 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
--
1.8.3.1
- [Qemu-devel] [PATCH 19/52] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64, (continued)
- [Qemu-devel] [PATCH 19/52] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 18/52] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 17/52] hw/nios2/Makefile.objs: Conditionally build nios2, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 24/52] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 15/52] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 23/52] hw/moxie/Makefile.objs: Conditionally build moxie, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 25/52] hw/tricore/Makefile.objs: Create CONFIG_* for tricore, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 27/52] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 20/52] hw/alpha/Makefile.objs: Create CONFIG_* for alpha, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 22/52] hw/hppa/Makefile.objs: Create CONFIG_* for hppa, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 16/52] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 12/52] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 11/52] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_*, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 30/52] minikconfig: add semantic analysis, Paolo Bonzini, 2019/01/25
- [Qemu-devel] [PATCH 13/52] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices, Paolo Bonzini, 2019/01/25