Skip to content

Commit 6b66389

Browse files
author
Herton R. Krzesinski
committed
Merge: vfio migration support
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1980 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165989 Upstream Status: mainline Testing: PF/VF NIC assignment, Intel/NVIDIA vGPU assignment, NVIDIA GPU assignment. Regression testing only. Backport support for vfio migration features Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Approved-by: Eric Auger <eric.auger@redhat.com> Approved-by: Cédric Le Goater <clg@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 7a9ed44 + 42f5d2e commit 6b66389

File tree

8 files changed

+936
-10
lines changed

8 files changed

+936
-10
lines changed

drivers/vfio/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ menuconfig VFIO
33
tristate "VFIO Non-Privileged userspace driver framework"
44
select IOMMU_API
55
select VFIO_IOMMU_TYPE1 if MMU && (X86 || S390 || ARM || ARM64)
6+
select INTERVAL_TREE
67
help
78
VFIO provides a framework for secure userspace device drivers.
89
See Documentation/driver-api/vfio.rst for more details.

drivers/vfio/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# SPDX-License-Identifier: GPL-2.0
22
vfio_virqfd-y := virqfd.o
33

4-
vfio-y += vfio_main.o
5-
64
obj-$(CONFIG_VFIO) += vfio.o
5+
6+
vfio-y += vfio_main.o \
7+
iova_bitmap.o \
8+
79
obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o
810
obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o
911
obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o

0 commit comments

Comments
 (0)