Page MenuHomeFreeBSD
Files F111031987

D31462.id93410.diff
No OneTemporary
Actions

D31462.id93410.diff
View Options

Index: sys/amd64/vmm/amd/amdvi_hw.c
===================================================================
--- sys/amd64/vmm/amd/amdvi_hw.c
+++ sys/amd64/vmm/amd/amdvi_hw.c
@@ -1181,7 +1181,7 @@
}
static uint64_t
-amdvi_destroy_mapping(void *arg, vm_paddr_t gpa, uint64_t len)
+amdvi_remove_mapping(void *arg, vm_paddr_t gpa, uint64_t len)
{
struct amdvi_domain *domain;
@@ -1360,7 +1360,7 @@
}
static void
-amdvi_inv_tlb(void *arg)
+amdvi_invalidate_tlb(void *arg)
{
struct amdvi_domain *domain;
@@ -1369,16 +1369,16 @@
amdvi_do_inv_domain(domain->id, false);
}
-struct iommu_ops iommu_ops_amd = {
- amdvi_init,
- amdvi_cleanup,
- amdvi_enable,
- amdvi_disable,
- amdvi_create_domain,
- amdvi_destroy_domain,
- amdvi_create_mapping,
- amdvi_destroy_mapping,
- amdvi_add_device,
- amdvi_remove_device,
- amdvi_inv_tlb
+const struct iommu_ops iommu_ops_amd = {
+ .init = amdvi_init,
+ .cleanup = amdvi_cleanup,
+ .enable = amdvi_enable,
+ .disable = amdvi_disable,
+ .create_domain = amdvi_create_domain,
+ .destroy_domain = amdvi_destroy_domain,
+ .create_mapping = amdvi_create_mapping,
+ .remove_mapping = amdvi_remove_mapping,
+ .add_device = amdvi_add_device,
+ .remove_device = amdvi_remove_device,
+ .invalidate_tlb = amdvi_invalidate_tlb
};
Index: sys/amd64/vmm/intel/vtd.c
===================================================================
--- sys/amd64/vmm/intel/vtd.c
+++ sys/amd64/vmm/intel/vtd.c
@@ -761,16 +761,16 @@
free(dom, M_VTD);
}
-struct iommu_ops iommu_ops_intel = {
- vtd_init,
- vtd_cleanup,
- vtd_enable,
- vtd_disable,
- vtd_create_domain,
- vtd_destroy_domain,
- vtd_create_mapping,
- vtd_remove_mapping,
- vtd_add_device,
- vtd_remove_device,
- vtd_invalidate_tlb,
+const struct iommu_ops iommu_ops_intel = {
+ .init = vtd_init,
+ .cleanup = vtd_cleanup,
+ .enable = vtd_enable,
+ .disable = vtd_disable,
+ .create_domain = vtd_create_domain,
+ .destroy_domain = vtd_destroy_domain,
+ .create_mapping = vtd_create_mapping,
+ .remove_mapping = vtd_remove_mapping,
+ .add_device = vtd_add_device,
+ .remove_device = vtd_remove_device,
+ .invalidate_tlb = vtd_invalidate_tlb,
};
Index: sys/amd64/vmm/io/iommu.h
===================================================================
--- sys/amd64/vmm/io/iommu.h
+++ sys/amd64/vmm/io/iommu.h
@@ -60,8 +60,8 @@
iommu_invalidate_tlb_t invalidate_tlb;
};
-extern struct iommu_ops iommu_ops_intel;
-extern struct iommu_ops iommu_ops_amd;
+extern const struct iommu_ops iommu_ops_intel;
+extern const struct iommu_ops iommu_ops_amd;
void iommu_cleanup(void);
void *iommu_host_domain(void);
Index: sys/amd64/vmm/io/iommu.c
===================================================================
--- sys/amd64/vmm/io/iommu.c
+++ sys/amd64/vmm/io/iommu.c
@@ -59,7 +59,7 @@
SYSCTL_INT(_hw_vmm_iommu, OID_AUTO, enable, CTLFLAG_RDTUN, &iommu_enable, 0,
"Enable use of I/O MMU (required for PCI passthrough).");
-static struct iommu_ops *ops;
+static const struct iommu_ops *ops;
static void *host_domain;
static eventhandler_tag add_tag, delete_tag;

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 27, 11:27 AM (19 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16867823
Default Alt Text
D31462.id93410.diff (2 KB)

Event Timeline