intel_iommu: Remove 'x-' prefix from 'x-scalable-mode' and 'x-flts' properties
We had 'x-scalable-mode' for more than 5 years and 'x-flts' for more than 1 year, it's fine to remove 'x-' now. This is a prerequisite to enable intel_iommu's scalable mode and first stage translation support in libvirt. 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-2-zhenzhong.duan@intel.com>
Zhenzhong Duan committed
May 13, 2026 at 02:42 UTC
08dc347e523005cf1e365c3c350a1721b36516e9
5 files changed
+14
-14
docs/devel/vfio-iommufd.rst
+5
-5
@@ -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 x-flts=on
156
+Usage with intel_iommu featuring flts=on
157
------------------------------------------
158
159
Only IOMMUFD backed VFIO device is supported when intel_iommu is configured
160
-with x-flts=on, for legacy container backed VFIO device, below error shows:
160
+with flts=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 x-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 flts=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 x-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 flts=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
@@ -177,4 +177,4 @@ below if it's not needed by guest:
177
178
.. code-block:: bash
179
180
- -device intel-iommu,x-scalable-mode=off
180
+ -device intel-iommu,scalable-mode=off
hw/i386/intel_iommu.c
+4
-4
@@ -4200,8 +4200,8 @@ static const Property vtd_properties[] = {
4200
DEFINE_PROP_UINT8("aw-bits", IntelIOMMUState, aw_bits,
4201
VTD_HOST_ADDRESS_WIDTH),
4202
DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE),
4203
- DEFINE_PROP_BOOL("x-scalable-mode", IntelIOMMUState, scalable_mode, FALSE),
4204
- DEFINE_PROP_BOOL("x-flts", IntelIOMMUState, fsts, FALSE),
4203
+ DEFINE_PROP_BOOL("scalable-mode", IntelIOMMUState, scalable_mode, FALSE),
4204
+ DEFINE_PROP_BOOL("flts", 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,7 +5563,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
5563
}
5564
5565
if (!s->scalable_mode && s->fsts) {
5566
- error_setg(errp, "x-flts is only available in scalable mode");
5566
+ error_setg(errp, "flts is only available in scalable mode");
5567
return false;
5568
}
5569
@@ -5576,7 +5576,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
5576
}
5577
5578
if (s->fsts && s->aw_bits != VTD_HOST_AW_48BIT) {
5579
- error_setg(errp, "Scalable mode(x-flts=on): supported value for "
5579
+ error_setg(errp, "Scalable mode(flts=on): supported value for "
5580
"aw-bits is: %d", VTD_HOST_AW_48BIT);
5581
return false;
5582
}
hw/i386/intel_iommu_accel.c
+2
-2
@@ -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 x-flts=on");
29
+ error_setg(errp, "Need IOMMUFD backend when flts=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 x-flts=on");
47
+ "unsupported when flts=on");
48
return false;
49
}
50
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,x-scalable-mode=on,x-flts=on");
32
+ s = qtest_init("-M q35 -device intel-iommu,scalable-mode=on,flts=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
+2
-2
@@ -54,10 +54,10 @@ static const char *qvtd_iommu_args(QVTDTransMode mode)
54
{
55
switch (mode) {
56
case QVTD_TM_SCALABLE_FLT:
57
- return "-device intel-iommu,x-scalable-mode=on,x-flts=on ";
57
+ return "-device intel-iommu,scalable-mode=on,flts=on ";
58
case QVTD_TM_SCALABLE_PT:
59
case QVTD_TM_SCALABLE_SLT:
60
- return "-device intel-iommu,x-scalable-mode=on ";
60
+ return "-device intel-iommu,scalable-mode=on ";
61
default:
62
return "-device intel-iommu ";
63
}