From: Xiangkai Yang yangxiangkai@huawei.com

virtcca inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IADD42

--------------------------------

virtCCA feature Signed-off-by: Xiangkai Yang yangxiangkai@huawei.com --- drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c | 3 ++- virt/kvm/vfio.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c index e3978967f1..fe93ea5d40 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c @@ -520,7 +520,8 @@ u32 arm_smmu_tmi_dev_attach(struct arm_smmu_domain *arm_smmu_domain, break; if (j < i) continue; - ret = tmi_dev_attach(sid, virtcca_cvm->rd, arm_smmu_domain->smmu->id); + ret = tmi_dev_attach(sid, virtcca_cvm->rd, + arm_smmu_domain->smmu->id); if (ret) { kvm_err("dev protected failed!\n"); ret = -ENXIO; diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index 6c99956ee7..8acd7b4251 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -246,7 +246,6 @@ static int kvm_vfio_file_del(struct kvm_device *dev, unsigned int fd)

return ret; } - #ifdef CONFIG_SPAPR_TCE_IOMMU static int kvm_vfio_file_set_spapr_tce(struct kvm_device *dev, void __user *arg)