- Revert "linux-user: Print tid not pid with strace" - gpex-acpi: Remove duplicate DSM #5 - smmuv3: Use default bus for arm-smmuv3-accel - smmuv3: Change arm-smmuv3-nested name to arm-smmuv3-accel - smmu-common: Return sysmem address space only for vfio-pci - smmuv3: realize get_pasid_cap and set ssidsize with pasid - vfio: Synthesize vPASID capability to VM - backend/iommufd: Report PASID capability - pci: Get pasid capability from vIOMMU - smmuv3: Add support for page fault handling - kvm: Translate MSI doorbell address only if it is valid - hw/arm/smmuv3: Enable sva/stall IDR features - iommufd.h: Updated to openeuler olk-6.6 kernel - tests/data/acpi/virt: Update IORT acpi table - hw/arm/virt-acpi-build: Add IORT RMR regions to handle MSI nested binding - tests/qtest: Allow IORT acpi table to change - hw/arm/virt-acpi-build: Build IORT with multiple SMMU nodes - hw/arm/smmuv3: Associate a pci bus with a SMMUv3 Nested device - hw/arm/smmuv3: Add initial support for SMMUv3 Nested device - hw/arm/virt: Add an SMMU_IO_LEN macro - hw/pci-host/gpex: [needs kernel fix] Allow to generate preserve boot config DSM #5 - tests/data/acpi: Update DSDT acpi tables - acpi/gpex: Fix PCI Express Slot Information function 0 returned value - tests/qtest: Allow DSDT acpi tables to change - hw/arm/smmuv3: Forward cache invalidate commands via iommufd - hw/arm/smmu-common: Replace smmu_iommu_mr with smmu_find_sdev - hw/arm/smmuv3: Add missing STE invalidation - hw/arm/smmuv3: Add smmu_dev_install_nested_ste() for CFGI_STE - hw/arm/smmuv3: Check idr registers for STE_S1CDMAX and STE_S1STALLD - hw/arm/smmuv3: Read host SMMU device info - hw/arm/smmuv3: Ignore IOMMU_NOTIFIER_MAP for nested-smmuv3 - hw/arm/smmu-common: Return sysmem if stage-1 is bypassed - hw/arm/smmu-common: Add iommufd helpers - hw/arm/smmu-common: Add set/unset_iommu_device callback - hw/arm/smmu-common: Extract smmu_get_sbus and smmu_get_sdev helpers - hw/arm/smmu-common: Bypass emulated IOTLB for a nested SMMU - hw/arm/smmu-common: Add a nested flag to SMMUState - backends/iommufd: Introduce iommufd_viommu_invalidate_cache - backends/iommufd: Introduce iommufd_vdev_alloc - backends/iommufd: Introduce iommufd_backend_alloc_viommu - vfio/iommufd: Implement [at|de]tach_hwpt handlers - vfio/iommufd: Implement HostIOMMUDeviceClass::realize_late() handler - HostIOMMUDevice: Introduce realize_late callback - vfio/iommufd: Add properties and handlers to TYPE_HOST_IOMMU_DEVICE_IOMMUFD - backends/iommufd: Add helpers for invalidating user-managed HWPT - Update iommufd.h header for vSVA - vfio/common: Allow disabling device dirty page tracking - vfio/migration: Don't block migration device dirty tracking is unsupported - vfio/iommufd: Implement VFIOIOMMUClass::query_dirty_bitmap support - vfio/iommufd: Implement VFIOIOMMUClass::set_dirty_tracking support - vfio/iommufd: Probe and request hwpt dirty tracking capability - vfio/{iommufd, container}: Invoke HostIOMMUDevice::realize() during attach_device() - vfio/iommufd: Add hw_caps field to HostIOMMUDeviceCaps - vfio/{iommufd,container}: Remove caps::aw_bits - HostIOMMUDevice: Store the VFIO/VDPA agent - vfio/iommufd: Introduce auto domain creation - vfio/ccw: Don't initialize HOST_IOMMU_DEVICE with mdev - vfio/ap: Don't initialize HOST_IOMMU_DEVICE with mdev - vfio/iommufd: Return errno in iommufd_cdev_attach_ioas_hwpt() - backends/iommufd: Extend iommufd_backend_get_device_info() to fetch HW capabilities - vfio/iommufd: Don't initialize nor set a HOST_IOMMU_DEVICE with mdev - vfio/pci: Extract mdev check into an helper - intel_iommu: Check compatibility with host IOMMU capabilities - intel_iommu: Implement [set|unset]_iommu_device() callbacks - intel_iommu: Extract out vtd_cap_init() to initialize cap/ecap - vfio/pci: Pass HostIOMMUDevice to vIOMMU - hw/pci: Introduce pci_device_[set|unset]_iommu_device() - hw/pci: Introduce helper function pci_device_get_iommu_bus_devfn() - vfio: Create host IOMMU device instance - backends/iommufd: Implement HostIOMMUDeviceClass::get_cap() handler - vfio/container: Implement HostIOMMUDeviceClass::get_cap() handler - vfio/iommufd: Implement HostIOMMUDeviceClass::realize() handler - backends/iommufd: Introduce helper function iommufd_backend_get_device_info() - vfio/container: Implement HostIOMMUDeviceClass::realize() handler - range: Introduce range_get_last_bit() - backends/iommufd: Introduce TYPE_HOST_IOMMU_DEVICE_IOMMUFD[_VFIO] devices - vfio/container: Introduce TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO device - backends/host_iommu_device: Introduce HostIOMMUDeviceCaps - backends: Introduce HostIOMMUDevice abstract - vfio/iommufd: Remove CONFIG_IOMMUFD usage - vfio/spapr: Extend VFIOIOMMUOps with a release handler - vfio/spapr: Only compile sPAPR IOMMU support when needed - vfio/iommufd: Introduce a VFIOIOMMU iommufd QOM interface - vfio/spapr: Introduce a sPAPR VFIOIOMMU QOM interface - vfio/container: Intoduce a new VFIOIOMMUClass::setup handler - vfio/container: Introduce a VFIOIOMMU legacy QOM interface - vfio/container: Introduce a VFIOIOMMU QOM interface - vfio/container: Initialize VFIOIOMMUOps under vfio_init_container() - vfio/container: Introduce vfio_legacy_setup() for further cleanups - docs/devel: Add VFIO iommufd backend documentation - vfio: Introduce a helper function to initialize VFIODevice - vfio/ccw: Move VFIODevice initializations in vfio_ccw_instance_init - vfio/ap: Move VFIODevice initializations in vfio_ap_instance_init - vfio/platform: Move VFIODevice initializations in vfio_platform_instance_init - vfio/pci: Move VFIODevice initializations in vfio_instance_init - hw/i386: Activate IOMMUFD for q35 machines - kconfig: Activate IOMMUFD for s390x machines - hw/arm: Activate IOMMUFD for virt machines - vfio: Make VFIOContainerBase poiner parameter const in VFIOIOMMUOps callbacks - vfio/ccw: Make vfio cdev pre-openable by passing a file handle - vfio/ccw: Allow the selection of a given iommu backend - vfio/ap: Make vfio cdev pre-openable by passing a file handle - vfio/ap: Allow the selection of a given iommu backend - vfio/platform: Make vfio cdev pre-openable by passing a file handle - vfio/platform: Allow the selection of a given iommu backend - vfio/pci: Make vfio cdev pre-openable by passing a file handle - vfio/pci: Allow the selection of a given iommu backend - vfio/iommufd: Enable pci hot reset through iommufd cdev interface - vfio/pci: Introduce a vfio pci hot reset interface - vfio/pci: Extract out a helper vfio_pci_get_pci_hot_reset_info - vfio/iommufd: Add support for iova_ranges and pgsizes - vfio/iommufd: Relax assert check for iommufd backend - vfio/iommufd: Implement the iommufd backend - vfio/common: return early if space isn't empty - util/char_dev: Add open_cdev() - backends/iommufd: Introduce the iommufd object - vfio/spapr: Move hostwin_list into spapr container - vfio/spapr: Move prereg_listener into spapr container - vfio/spapr: switch to spapr IOMMU BE add/del_section_window - vfio/spapr: Introduce spapr backend and target interface - vfio/container: Implement attach/detach_device - vfio/container: Move iova_ranges to base container - vfio/container: Move dirty_pgsizes and max_dirty_bitmap_size to base container - vfio/container: Move listener to base container - vfio/container: Move vrdl_list to base container - vfio/container: Move pgsizes and dma_max_mappings to base container - vfio/container: Convert functions to base container - vfio/container: Move per container device list in base container - vfio/container: Switch to IOMMU BE set_dirty_page_tracking/query_dirty_bitmap API - vfio/container: Move space field to base container - vfio/common: Move giommu_list in base container - vfio/common: Introduce vfio_container_init/destroy helper - vfio/container: Switch to dma_map|unmap API - vfio/container: Introduce a empty VFIOIOMMUOps - vfio: Introduce base object for VFIOContainer and targeted interface - cryptodev: Fix error handling in cryptodev_lkcf_execute_task() - hw/xen: Fix xen_bus_realize() error handling - hw/misc/aspeed_hace: Fix buffer overflow in has_padding function - target/s390x: Fix a typo in s390_cpu_class_init() - hw/sd/sdhci: free irq on exit - hw/ufs: free irq on exit - hw/pci-host/designware: Fix ATU_UPPER_TARGET register access - target/i386: Make invtsc migratable when user sets tsc-khz explicitly - target/i386: Construct CPUID 2 as stateful iff times > 1 - target/i386: Enable fdp-excptn-only and zero-fcs-fds - target/i386: Don't construct a all-zero entry for CPUID[0xD 0x3f] - i386/cpuid: Remove subleaf constraint on CPUID leaf 1F - target/i386: pass X86CPU to x86_cpu_get_supported_feature_word - target/i386: Raise the highest index value used for any VMCS encoding - target/i386: Add VMX control bits for nested FRED support - target/i386: Delete duplicated macro definition CR4_FRED_MASK - target/i386: Add get/set/migrate support for FRED MSRs - target/i386: enumerate VMX nested-exception support - vmxcap: add support for VMX FRED controls - target/i386: mark CR4.FRED not reserved - target/i386: add support for FRED in CPUID enumeration - target/i386: fix feature dependency for WAITPKG - target/i386: Add more features enumerated by CPUID.7.2.EDX - net: fix build when libbpf is disabled, but libxdp is enabled - hw/nvme: fix invalid endian conversion - hw/nvme: fix invalid check on mcl - backends/cryptodev: Do not ignore throttle/backends Errors - backends/cryptodev: Do not abort for invalid session ID - virtcca: add kvm isolation when get tmi version. - qga: Don't daemonize before channel is initialized - qga: Add log to guest-fsfreeze-thaw command - backends: VirtCCA: cvm_gpa_start supports both 1GB and 3GB - BUGFIX: Enforce isolation for virtcca_shared_hugepage - arm: VirtCCA: qemu CoDA support UEFI boot - arm: VirtCCA: Compatibility with older versions of TMM and the kernel - arm: VirtCCA: qemu uefi boot support kae - arm: VirtCCA: CVM support UEFI boot Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 85fd7a435d8203dde56fedc4c8f500e41faf132c)
288 lines
13 KiB
Diff
288 lines
13 KiB
Diff
From f702d050b4309bb7e7ffc159a3c41c82fe34ba07 Mon Sep 17 00:00:00 2001
|
|
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Date: Sat, 11 Jan 2025 10:52:54 +0800
|
|
Subject: [PATCH] vfio: Make VFIOContainerBase poiner parameter const in
|
|
VFIOIOMMUOps callbacks
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Some of the callbacks in VFIOIOMMUOps pass VFIOContainerBase poiner,
|
|
those callbacks only need read access to the sub object of VFIOContainerBase.
|
|
So make VFIOContainerBase, VFIOContainer and VFIOIOMMUFDContainer as const
|
|
in these callbacks.
|
|
|
|
Local functions called by those callbacks also need same changes to avoid
|
|
build error.
|
|
|
|
Modify vfio_lookup_match_range/vfio_legacy_dma_map during backporting.
|
|
|
|
Suggested-by: Cédric Le Goater <clg@redhat.com>
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
|
Tested-by: Eric Auger <eric.auger@redhat.com>
|
|
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
|
|
---
|
|
hw/vfio/common.c | 9 +++----
|
|
hw/vfio/container-base.c | 2 +-
|
|
hw/vfio/container.c | 34 ++++++++++++++-------------
|
|
hw/vfio/iommufd.c | 8 +++----
|
|
include/hw/vfio/vfio-common.h | 14 ++++++-----
|
|
include/hw/vfio/vfio-container-base.h | 12 ++++++----
|
|
6 files changed, 43 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
|
|
index 0e900c6746..d572ec5880 100644
|
|
--- a/hw/vfio/common.c
|
|
+++ b/hw/vfio/common.c
|
|
@@ -204,7 +204,7 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainerBase *bcontainer)
|
|
return true;
|
|
}
|
|
|
|
-bool vfio_devices_all_device_dirty_tracking(VFIOContainerBase *bcontainer)
|
|
+bool vfio_devices_all_device_dirty_tracking(const VFIOContainerBase *bcontainer)
|
|
{
|
|
VFIODevice *vbasedev;
|
|
|
|
@@ -221,7 +221,8 @@ bool vfio_devices_all_device_dirty_tracking(VFIOContainerBase *bcontainer)
|
|
* Check if all VFIO devices are running and migration is active, which is
|
|
* essentially equivalent to the migration being in pre-copy phase.
|
|
*/
|
|
-bool vfio_devices_all_running_and_mig_active(VFIOContainerBase *bcontainer)
|
|
+bool
|
|
+vfio_devices_all_running_and_mig_active(const VFIOContainerBase *bcontainer)
|
|
{
|
|
VFIODevice *vbasedev;
|
|
|
|
@@ -1139,7 +1140,7 @@ static int vfio_device_dma_logging_report(VFIODevice *vbasedev, hwaddr iova,
|
|
return 0;
|
|
}
|
|
|
|
-int vfio_devices_query_dirty_bitmap(VFIOContainerBase *bcontainer,
|
|
+int vfio_devices_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|
VFIOBitmap *vbmap, hwaddr iova,
|
|
hwaddr size)
|
|
{
|
|
@@ -1162,7 +1163,7 @@ int vfio_devices_query_dirty_bitmap(VFIOContainerBase *bcontainer,
|
|
return 0;
|
|
}
|
|
|
|
-int vfio_get_dirty_bitmap(VFIOContainerBase *bcontainer, uint64_t iova,
|
|
+int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova,
|
|
uint64_t size, ram_addr_t ram_addr)
|
|
{
|
|
bool all_device_dirty_tracking =
|
|
diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c
|
|
index eee2dcfe76..1ffd25bbfa 100644
|
|
--- a/hw/vfio/container-base.c
|
|
+++ b/hw/vfio/container-base.c
|
|
@@ -63,7 +63,7 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer,
|
|
return bcontainer->ops->set_dirty_page_tracking(bcontainer, start);
|
|
}
|
|
|
|
-int vfio_container_query_dirty_bitmap(VFIOContainerBase *bcontainer,
|
|
+int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|
VFIOBitmap *vbmap,
|
|
hwaddr iova, hwaddr size)
|
|
{
|
|
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
|
|
index e32e1b51e0..67aeaa825b 100644
|
|
--- a/hw/vfio/container.c
|
|
+++ b/hw/vfio/container.c
|
|
@@ -63,11 +63,11 @@ static int vfio_ram_block_discard_disable(VFIOContainer *container, bool state)
|
|
}
|
|
}
|
|
|
|
-static int vfio_dma_unmap_bitmap(VFIOContainer *container,
|
|
+static int vfio_dma_unmap_bitmap(const VFIOContainer *container,
|
|
hwaddr iova, ram_addr_t size,
|
|
IOMMUTLBEntry *iotlb)
|
|
{
|
|
- VFIOContainerBase *bcontainer = &container->bcontainer;
|
|
+ const VFIOContainerBase *bcontainer = &container->bcontainer;
|
|
struct vfio_iommu_type1_dma_unmap *unmap;
|
|
struct vfio_bitmap *bitmap;
|
|
VFIOBitmap vbmap;
|
|
@@ -116,7 +116,7 @@ unmap_exit:
|
|
return ret;
|
|
}
|
|
|
|
-VFIODMARange *vfio_lookup_match_range(VFIOContainer *container,
|
|
+VFIODMARange *vfio_lookup_match_range(const VFIOContainer *container,
|
|
hwaddr start_addr, hwaddr size)
|
|
{
|
|
VFIODMARange *qrange;
|
|
@@ -142,11 +142,12 @@ void vfio_dma_range_init_dirty_bitmap(VFIODMARange *qrange)
|
|
/*
|
|
* DMA - Mapping and unmapping for the "type1" IOMMU interface used on x86
|
|
*/
|
|
-static int vfio_legacy_dma_unmap(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
- ram_addr_t size, IOMMUTLBEntry *iotlb)
|
|
+static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer,
|
|
+ hwaddr iova, ram_addr_t size,
|
|
+ IOMMUTLBEntry *iotlb)
|
|
{
|
|
- VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
- bcontainer);
|
|
+ const VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
+ bcontainer);
|
|
struct vfio_iommu_type1_dma_unmap unmap = {
|
|
.argsz = sizeof(unmap),
|
|
.flags = 0,
|
|
@@ -216,11 +217,11 @@ static int vfio_legacy_dma_unmap(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
return 0;
|
|
}
|
|
|
|
-static int vfio_legacy_dma_map(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
+static int vfio_legacy_dma_map(const VFIOContainerBase *bcontainer, hwaddr iova,
|
|
ram_addr_t size, void *vaddr, bool readonly)
|
|
{
|
|
VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
- bcontainer);
|
|
+ bcontainer);
|
|
struct vfio_iommu_type1_dma_map map = {
|
|
.argsz = sizeof(map),
|
|
.flags = VFIO_DMA_MAP_FLAG_READ,
|
|
@@ -257,11 +258,12 @@ static int vfio_legacy_dma_map(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
return -errno;
|
|
}
|
|
|
|
-static int vfio_legacy_set_dirty_page_tracking(VFIOContainerBase *bcontainer,
|
|
- bool start)
|
|
+static int
|
|
+vfio_legacy_set_dirty_page_tracking(const VFIOContainerBase *bcontainer,
|
|
+ bool start)
|
|
{
|
|
- VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
- bcontainer);
|
|
+ const VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
+ bcontainer);
|
|
int ret;
|
|
struct vfio_iommu_type1_dirty_bitmap dirty = {
|
|
.argsz = sizeof(dirty),
|
|
@@ -283,12 +285,12 @@ static int vfio_legacy_set_dirty_page_tracking(VFIOContainerBase *bcontainer,
|
|
return ret;
|
|
}
|
|
|
|
-static int vfio_legacy_query_dirty_bitmap(VFIOContainerBase *bcontainer,
|
|
+static int vfio_legacy_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|
VFIOBitmap *vbmap,
|
|
hwaddr iova, hwaddr size)
|
|
{
|
|
- VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
- bcontainer);
|
|
+ const VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
|
+ bcontainer);
|
|
struct vfio_iommu_type1_dirty_bitmap *dbitmap;
|
|
struct vfio_iommu_type1_dirty_bitmap_get *range;
|
|
int ret;
|
|
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
|
|
index 5accd26484..87a561c545 100644
|
|
--- a/hw/vfio/iommufd.c
|
|
+++ b/hw/vfio/iommufd.c
|
|
@@ -26,10 +26,10 @@
|
|
#include "qemu/chardev_open.h"
|
|
#include "pci.h"
|
|
|
|
-static int iommufd_cdev_map(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
+static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
|
|
ram_addr_t size, void *vaddr, bool readonly)
|
|
{
|
|
- VFIOIOMMUFDContainer *container =
|
|
+ const VFIOIOMMUFDContainer *container =
|
|
container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
|
|
|
|
return iommufd_backend_map_dma(container->be,
|
|
@@ -37,11 +37,11 @@ static int iommufd_cdev_map(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
iova, size, vaddr, readonly);
|
|
}
|
|
|
|
-static int iommufd_cdev_unmap(VFIOContainerBase *bcontainer,
|
|
+static int iommufd_cdev_unmap(const VFIOContainerBase *bcontainer,
|
|
hwaddr iova, ram_addr_t size,
|
|
IOMMUTLBEntry *iotlb)
|
|
{
|
|
- VFIOIOMMUFDContainer *container =
|
|
+ const VFIOIOMMUFDContainer *container =
|
|
container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
|
|
|
|
/* TODO: Handle dma_unmap_bitmap with iotlb args (migration) */
|
|
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
|
|
index 5f35f2900b..37f01410d5 100644
|
|
--- a/include/hw/vfio/vfio-common.h
|
|
+++ b/include/hw/vfio/vfio-common.h
|
|
@@ -186,7 +186,7 @@ typedef struct VFIODisplay {
|
|
VFIOAddressSpace *vfio_get_address_space(AddressSpace *as);
|
|
void vfio_put_address_space(VFIOAddressSpace *space);
|
|
|
|
-VFIODMARange *vfio_lookup_match_range(VFIOContainer *container,
|
|
+VFIODMARange *vfio_lookup_match_range(const VFIOContainer *container,
|
|
hwaddr start_addr, hwaddr size);
|
|
void vfio_dma_range_init_dirty_bitmap(VFIODMARange *qrange);
|
|
|
|
@@ -258,13 +258,15 @@ bool vfio_migration_realize(VFIODevice *vbasedev, Error **errp);
|
|
void vfio_migration_exit(VFIODevice *vbasedev);
|
|
|
|
int vfio_bitmap_alloc(VFIOBitmap *vbmap, hwaddr size);
|
|
-bool vfio_devices_all_running_and_mig_active(VFIOContainerBase *bcontainer);
|
|
-bool vfio_devices_all_device_dirty_tracking(VFIOContainerBase *bcontainer);
|
|
-int vfio_devices_query_dirty_bitmap(VFIOContainerBase *bcontainer,
|
|
+bool
|
|
+vfio_devices_all_running_and_mig_active(const VFIOContainerBase *bcontainer);
|
|
+bool
|
|
+vfio_devices_all_device_dirty_tracking(const VFIOContainerBase *bcontainer);
|
|
+int vfio_devices_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|
VFIOBitmap *vbmap, hwaddr iova,
|
|
hwaddr size);
|
|
-int vfio_get_dirty_bitmap(VFIOContainerBase *bcontainer, uint64_t iova,
|
|
- uint64_t size, ram_addr_t ram_addr);
|
|
+int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova,
|
|
+ uint64_t size, ram_addr_t ram_addr);
|
|
|
|
/* Returns 0 on success, or a negative errno. */
|
|
int vfio_device_get_name(VFIODevice *vbasedev, Error **errp);
|
|
diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h
|
|
index 45bb19c767..2ae297ccda 100644
|
|
--- a/include/hw/vfio/vfio-container-base.h
|
|
+++ b/include/hw/vfio/vfio-container-base.h
|
|
@@ -82,7 +82,7 @@ void vfio_container_del_section_window(VFIOContainerBase *bcontainer,
|
|
MemoryRegionSection *section);
|
|
int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer,
|
|
bool start);
|
|
-int vfio_container_query_dirty_bitmap(VFIOContainerBase *bcontainer,
|
|
+int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer,
|
|
VFIOBitmap *vbmap,
|
|
hwaddr iova, hwaddr size);
|
|
|
|
@@ -93,18 +93,20 @@ void vfio_container_destroy(VFIOContainerBase *bcontainer);
|
|
|
|
struct VFIOIOMMUOps {
|
|
/* basic feature */
|
|
- int (*dma_map)(VFIOContainerBase *bcontainer,
|
|
+ int (*dma_map)(const VFIOContainerBase *bcontainer,
|
|
hwaddr iova, ram_addr_t size,
|
|
void *vaddr, bool readonly);
|
|
- int (*dma_unmap)(VFIOContainerBase *bcontainer,
|
|
+ int (*dma_unmap)(const VFIOContainerBase *bcontainer,
|
|
hwaddr iova, ram_addr_t size,
|
|
IOMMUTLBEntry *iotlb);
|
|
int (*attach_device)(const char *name, VFIODevice *vbasedev,
|
|
AddressSpace *as, Error **errp);
|
|
void (*detach_device)(VFIODevice *vbasedev);
|
|
/* migration feature */
|
|
- int (*set_dirty_page_tracking)(VFIOContainerBase *bcontainer, bool start);
|
|
- int (*query_dirty_bitmap)(VFIOContainerBase *bcontainer, VFIOBitmap *vbmap,
|
|
+ int (*set_dirty_page_tracking)(const VFIOContainerBase *bcontainer,
|
|
+ bool start);
|
|
+ int (*query_dirty_bitmap)(const VFIOContainerBase *bcontainer,
|
|
+ VFIOBitmap *vbmap,
|
|
hwaddr iova, hwaddr size);
|
|
/* PCI specific */
|
|
int (*pci_hot_reset)(VFIODevice *vbasedev, bool single);
|
|
--
|
|
2.41.0.windows.1
|
|
|