intel_iommu: Change 'flts' property naming to 'fsts'
Previous patch Removed 'x-' prefix from 'x-flts' property. Opportunistically, this patch does s/flts/fsts for property name in order to better align with newer spec since revision 3.4 which changed terminology from "First-level" to "First-stage". Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-Id: <20260513064227.2304854-3-zhenzhong.duan@intel.com>
Zhenzhong Duan committed
May 13, 2026 at 02:42 UTC
c068e00cff16a7560d974c957f1f1bde158573af
5 files changed
+14
-14
docs/devel/vfio-iommufd.rst
+4
-4
@@ -153,22 +153,22 @@ RAM discarding for mdev.
153
``vfio-ap`` and ``vfio-ccw`` devices don't have same issue as their backend
154
devices are always mdev and RAM discarding is force enabled.
155
156
-Usage with intel_iommu featuring flts=on
156
+Usage with intel_iommu featuring fsts=on
157
------------------------------------------
158
159
Only IOMMUFD backed VFIO device is supported when intel_iommu is configured
160
-with flts=on, for legacy container backed VFIO device, below error shows:
160
+with fsts=on, for legacy container backed VFIO device, below error shows:
161
162
.. code-block:: none
163
164
- qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0: vfio 0000:02:00.0: Failed to set vIOMMU: Need IOMMUFD backend when flts=on
164
+ qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0: vfio 0000:02:00.0: Failed to set vIOMMU: Need IOMMUFD backend when fsts=on
165
166
VFIO device under PCI bridge is unsupported, use PCIE bridge if necessary,
167
otherwise below error shows:
168
169
.. code-block:: none
170
171
- qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0,bus=bridge1,iommufd=iommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device downstream to a PCI bridge is unsupported when flts=on
171
+ qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0,bus=bridge1,iommufd=iommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device downstream to a PCI bridge is unsupported when fsts=on
172
173
If host IOMMU has ERRATA_772415_SPR17, running guest with "intel_iommu=on,sm_off"
174
is unsupported, kexec or reboot guest from "intel_iommu=on,sm_on" to
hw/i386/intel_iommu.c
+5
-5
@@ -4201,7 +4201,7 @@ static const Property vtd_properties[] = {
4201
VTD_HOST_ADDRESS_WIDTH),
4202
DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE),
4203
DEFINE_PROP_BOOL("scalable-mode", IntelIOMMUState, scalable_mode, FALSE),
4204
- DEFINE_PROP_BOOL("flts", IntelIOMMUState, fsts, FALSE),
4204
+ DEFINE_PROP_BOOL("fsts", IntelIOMMUState, fsts, FALSE),
4205
DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, false),
4206
DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false),
4207
DEFINE_PROP_BOOL("svm", IntelIOMMUState, svm, false),
@@ -5563,20 +5563,20 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
5563
}
5564
5565
if (!s->scalable_mode && s->fsts) {
5566
- error_setg(errp, "flts is only available in scalable mode");
5566
+ error_setg(errp, "fsts is only available in scalable mode");
5567
return false;
5568
}
5569
5570
if (!s->fsts && s->aw_bits != VTD_HOST_AW_39BIT &&
5571
s->aw_bits != VTD_HOST_AW_48BIT) {
5572
error_setg(errp, "%s: supported values for aw-bits are: %d, %d",
5573
- s->scalable_mode ? "Scalable mode(flts=off)" : "Legacy mode",
5573
+ s->scalable_mode ? "Scalable mode(fsts=off)" : "Legacy mode",
5574
VTD_HOST_AW_39BIT, VTD_HOST_AW_48BIT);
5575
return false;
5576
}
5577
5578
if (s->fsts && s->aw_bits != VTD_HOST_AW_48BIT) {
5579
- error_setg(errp, "Scalable mode(flts=on): supported value for "
5579
+ error_setg(errp, "Scalable mode(fsts=on): supported value for "
5580
"aw-bits is: %d", VTD_HOST_AW_48BIT);
5581
return false;
5582
}
@@ -5593,7 +5593,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
5593
}
5594
5595
if (!s->fsts) {
5596
- error_setg(errp, "Need to set flts for svm");
5596
+ error_setg(errp, "Need to set fsts for svm");
5597
return false;
5598
}
5599
hw/i386/intel_iommu_accel.c
+3
-3
@@ -26,7 +26,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMMUDevice *vtd_hiod,
26
PCIDevice *pdev = bus->devices[vtd_hiod->devfn];
27
28
if (!object_dynamic_cast(OBJECT(hiod), TYPE_HOST_IOMMU_DEVICE_IOMMUFD)) {
29
- error_setg(errp, "Need IOMMUFD backend when flts=on");
29
+ error_setg(errp, "Need IOMMUFD backend when fsts=on");
30
return false;
31
}
32
@@ -44,7 +44,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMMUDevice *vtd_hiod,
44
45
if (pci_device_get_iommu_bus_devfn(pdev, &bus, NULL, NULL)) {
46
error_setg(errp, "Host device downstream to a PCI bridge is "
47
- "unsupported when flts=on");
47
+ "unsupported when fsts=on");
48
return false;
49
}
50
@@ -105,7 +105,7 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
105
bool ret;
106
107
/*
108
- * We can get here only if flts=on, the supported PGTT is FST or PT.
108
+ * We can get here only if fsts=on, the supported PGTT is FST or PT.
109
* Catch invalid PGTT when processing invalidation request to avoid
110
* attaching to wrong hwpt.
111
*/
tests/qtest/intel-iommu-test.c
+1
-1
@@ -29,7 +29,7 @@ static void test_intel_iommu_stage_1(void)
29
uint64_t cap, ecap, tmp;
30
QTestState *s;
31
32
- s = qtest_init("-M q35 -device intel-iommu,scalable-mode=on,flts=on");
32
+ s = qtest_init("-M q35 -device intel-iommu,scalable-mode=on,fsts=on");
33
34
cap = vtd_reg_readq(s, DMAR_CAP_REG);
35
g_assert((cap & CAP_STAGE_1_FIXED1) == CAP_STAGE_1_FIXED1);
tests/qtest/iommu-intel-test.c
+1
-1
@@ -54,7 +54,7 @@ static const char *qvtd_iommu_args(QVTDTransMode mode)
54
{
55
switch (mode) {
56
case QVTD_TM_SCALABLE_FLT:
57
- return "-device intel-iommu,scalable-mode=on,flts=on ";
57
+ return "-device intel-iommu,scalable-mode=on,fsts=on ";
58
case QVTD_TM_SCALABLE_PT:
59
case QVTD_TM_SCALABLE_SLT:
60
return "-device intel-iommu,scalable-mode=on ";