From: ray <honglei.wang@xxxxxxxxxx>
This patch extends QEMU capabilities support for nvme and nvme-ns disks.
Signed-off-by: ray <honglei.wang@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 10 ++++++++++
src/qemu/qemu_capabilities.h | 2 ++
src/qemu/qemu_validate.c | 12 ++++++++++++
tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_10.0.0.s390x.xml | 2 ++
tests/domaincapsdata/qemu_10.0.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 2 ++
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 2 ++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 2 ++
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 2 ++
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 2 ++
tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 2 ++
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_7.2.0.ppc.xml | 2 ++
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml | 2 ++
tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml | 2 ++
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0.armv7l.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0.s390x.xml | 2 ++
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml | 2 ++
tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml | 2 ++
tests/domaincapsdata/qemu_9.1.0.s390x.xml | 2 ++
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 2 ++
tests/domaincapsdata/qemu_9.2.0.s390x.xml | 2 ++
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 2 ++
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 ++
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 2 ++
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 2 ++
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 2 ++
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 2 ++
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 2 ++
111 files changed, 240 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 23b466c36e..2b4793e509 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -728,6 +728,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
"machine.virt.aia", /* QEMU_CAPS_MACHINE_VIRT_AIA */
"virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
"blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
+ "nvme", /* QEMU_CAPS_DEVICE_NVME */
+ "nvme-ns", /* QEMU_CAPS_DEVICE_NVME_NS */
);
@@ -1418,6 +1420,8 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "sev-snp-guest", QEMU_CAPS_SEV_SNP_GUEST },
{ "acpi-erst", QEMU_CAPS_DEVICE_ACPI_ERST },
{ "virtio-mem-ccw", QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW },
+ { "nvme", QEMU_CAPS_DEVICE_NVME },
+ { "nvme-ns", QEMU_CAPS_DEVICE_NVME_NS },
};
@@ -6475,6 +6479,12 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCaps *qemuCaps,
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_AHCI))
VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_SATA);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVME))
+ VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_NVME);
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVME_NS))
+ VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_NVME_NS);
+
/* disk->model values */
VIR_DOMAIN_CAPS_ENUM_SET(disk->model, VIR_DOMAIN_DISK_MODEL_VIRTIO);
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL)) {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ee71331a09..6e425fac43 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -707,6 +707,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_MACHINE_VIRT_AIA, /* -machine virt,aia=(none|aplic|aplic-imsic), RISC-V only */
QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
+ QEMU_CAPS_DEVICE_NVME, /* -device nvme */
+ QEMU_CAPS_DEVICE_NVME_NS, /* -device nvme-ns */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index ffa9dcd3cc..f224c103d2 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -3156,6 +3156,12 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk,
break;
case VIR_DOMAIN_DISK_BUS_NVME:
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVME)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("This QEMU doesn't support '-device nvme'"));
+ return -1;
+ }
+
if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("unexpected address type for nvme disk"));
@@ -3169,6 +3175,12 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk,
break;
case VIR_DOMAIN_DISK_BUS_NVME_NS:
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVME_NS)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("This QEMU doesn't support '-device nvme-ns'"));
+ return -1;
+ }
+
if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("unexpected address type for nvme-ns disk"));
diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
index 73cb50e7b6..f2aad1249d 100644
--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
@@ -1547,6 +1547,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
index 9a7d39c1f8..c8878126e7 100644
--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
@@ -1655,6 +1655,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
index 4af3c7ec53..71dfbe0475 100644
--- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
@@ -242,6 +242,8 @@
<value>scsi</value>
<value>virtio</value>
<value>usb</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
index c06b9d1c51..7ec9562124 100644
--- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
@@ -1547,6 +1547,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index ce3ba14684..84c22cd251 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -883,6 +883,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml
index ac28059190..1b494224ba 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml
@@ -52,6 +52,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 92827056db..4c07b18aad 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1512,6 +1512,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index 4708b32b89..36d36062cb 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -99,6 +99,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml
index d636e5686a..39eaf5828a 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml
@@ -55,6 +55,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index 4708b32b89..36d36062cb 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -99,6 +99,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index a6daef9798..b33a191ae0 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -65,6 +65,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 21e8a55a63..f9762d4ce0 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -883,6 +883,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index ba09a6cbb2..b8cb256823 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -905,6 +905,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index dc15afa017..9d80b1a6ec 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1602,6 +1602,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 74f3a04bb0..9b94a42601 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -100,6 +100,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index 74f3a04bb0..9b94a42601 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -100,6 +100,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 72ceb31595..bb4cdf11bd 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -905,6 +905,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index deaa3a0041..ea8373b096 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -1006,6 +1006,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 469752cf32..42f1df4150 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1799,6 +1799,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 7484c13f2c..ad932f28a3 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -1006,6 +1006,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index d1a8399812..0f3556076b 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -1012,6 +1012,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 8c8f016233..0bb82674c0 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1814,6 +1814,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index 051d2782b6..8599548714 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -101,6 +101,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index 051d2782b6..8599548714 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -101,6 +101,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index 39b07955dd..36df923a8e 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -65,6 +65,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 1f21b8be4e..1f250e8e7a 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -1012,6 +1012,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml
index bf130dde10..18fb66e6a6 100644
--- a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml
@@ -60,6 +60,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 2c5129453e..8686efcbca 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -1039,6 +1039,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index d4a567f5c6..bc67ed6ecd 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1838,6 +1838,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
index 4c49343c43..f2b813c092 100644
--- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -101,6 +101,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
index 4c49343c43..f2b813c092 100644
--- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -101,6 +101,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index 52c73d10a4..1c7908c000 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -65,6 +65,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 6fa08af994..303b135def 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -1039,6 +1039,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 8bed31ad22..a1060f62d8 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -1006,6 +1006,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index cb7fd8811b..9c3311275e 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1786,6 +1786,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
index ca0bc6f0b5..0799182fca 100644
--- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
@@ -60,6 +60,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index a0f8b13f72..c5f8c10602 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -1006,6 +1006,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
index 75b2f1102d..412012f0c4 100644
--- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
@@ -63,6 +63,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index f9d27024fc..e50513547e 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -1011,6 +1011,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index c7728ac454..9dd2ead2fb 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -1491,6 +1491,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index c7728ac454..9dd2ead2fb 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1491,6 +1491,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml
index c6ef37b1af..9492fb2c26 100644
--- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml
@@ -54,6 +54,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index f0d9493353..286e1c1287 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -1011,6 +1011,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index b8c376cb14..048e3e813e 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -1093,6 +1093,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml
index 7a9da4fe4f..121622404c 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml
@@ -52,6 +52,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index d3c9830a1a..9281e3ce43 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1586,6 +1586,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml
index 258df5b134..be8e25bea4 100644
--- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml
@@ -55,6 +55,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index e8df30ae07..d87ef654dd 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -1093,6 +1093,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index e80e175376..f4ee234183 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1352,6 +1352,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index 62ffabb3e2..cce17538a0 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1608,6 +1608,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 4117d926cb..acff323d2c 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1352,6 +1352,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index dfa88bcf96..51a531c0b8 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1353,6 +1353,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
index c9f01904cd..04c7c687b0 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
@@ -61,6 +61,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 327cad253e..8c391e717d 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1574,6 +1574,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
index 224c619168..0ae487756d 100644
--- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
@@ -109,6 +109,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
index ed3637eaec..ccd1b6e016 100644
--- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
@@ -65,6 +65,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
index 224c619168..0ae487756d 100644
--- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
@@ -109,6 +109,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
index 7182dca796..3bfe02fa85 100644
--- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
@@ -58,6 +58,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
index 57ac07c153..51cd020200 100644
--- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
@@ -331,6 +331,8 @@
<value>scsi</value>
<value>virtio</value>
<value>usb</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index f8dbb717f1..e60cede4cc 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1353,6 +1353,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index c5a653f57b..df05e36421 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1353,6 +1353,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 30876c5fef..f45f37582c 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1503,6 +1503,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 6c141e1cb9..f9b6d8397c 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1353,6 +1353,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 9445d999b5..395bb987f1 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1489,6 +1489,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
index b4327bf878..b6dc4f5607 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
@@ -71,6 +71,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 61d92550c1..d1c57e7432 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1608,6 +1608,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
index 73e5ba1bc3..81e8f6d0bf 100644
--- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
@@ -60,6 +60,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
index be46cfe6ba..7a8626c111 100644
--- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
@@ -194,6 +194,8 @@
<value>scsi</value>
<value>virtio</value>
<value>usb</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 5e87efe5e8..ca79e2f120 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1489,6 +1489,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index 98c522f0fc..46c87a63cf 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1547,6 +1547,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index 7ccdc11412..7d4268f6b4 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1655,6 +1655,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
index e13809bc63..553e93a988 100644
--- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
@@ -194,6 +194,8 @@
<value>scsi</value>
<value>virtio</value>
<value>usb</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 0b5162781e..c23303e457 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1547,6 +1547,8 @@
<value>virtio</value>
<value>usb</value>
<value>sata</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</enum>
<enum name='model'>
<value>virtio</value>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
index bccce19bfc..ce1f8270fe 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@@ -142,6 +142,8 @@
<flag name='query-cpu-model-expansion.deprecated-props'/>
<flag name='migrate-incoming.exit-on-error'/>
<flag name='virtio-mem-ccw'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9002050</version>
<microcodeVersion>39100285</microcodeVersion>
<package>v9.2.0-1203-gd6430c17d7</package>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index b1cf477bdc..f84380acc0 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -212,6 +212,8 @@
<flag name='netdev-stream-reconnect-miliseconds'/>
<flag name='migrate-incoming.exit-on-error'/>
<flag name='blockdev-set-active'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9002050</version>
<microcodeVersion>43100285</microcodeVersion>
<package>v9.2.0-1636-gffaf7f0376</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index ae426c5f7f..8cc6e01992 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -127,6 +127,8 @@
<flag name='usb-mtp'/>
<flag name='machine.virt.ras'/>
<flag name='netdev.user'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>5002000</version>
<microcodeVersion>61700243</microcodeVersion>
<package>v5.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index d7615208b3..e3e072c819 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -127,6 +127,8 @@
<flag name='virtio-crypto'/>
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>5002000</version>
<microcodeVersion>42900243</microcodeVersion>
<package>v5.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index c3452815b4..596dbbcf19 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -119,6 +119,8 @@
<flag name='virtio-crypto'/>
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>5002000</version>
<microcodeVersion>0</microcodeVersion>
<package>v5.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 4cd05fa7ec..b7b34e3438 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -161,6 +161,8 @@
<flag name='virtio-crypto'/>
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>5002000</version>
<microcodeVersion>43100243</microcodeVersion>
<package>v5.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index a02018a467..8939363942 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -139,6 +139,8 @@
<flag name='machine.virt.ras'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6000000</version>
<microcodeVersion>61700242</microcodeVersion>
<package>v6.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index a8897fb80b..303257eb5f 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -174,6 +174,8 @@
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6000000</version>
<microcodeVersion>43100242</microcodeVersion>
<package>v6.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index 0f2995a2d3..a886333210 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -180,6 +180,8 @@
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6001000</version>
<microcodeVersion>43100243</microcodeVersion>
<package>v6.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 5624ad95a1..32ea06c420 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -152,6 +152,8 @@
<flag name='machine.virt.ras'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6001050</version>
<microcodeVersion>61700244</microcodeVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index d4172c3146..8f6a9c1c03 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -140,6 +140,8 @@
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6002000</version>
<microcodeVersion>42900244</microcodeVersion>
<package>v6.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index 582b0e9b52..c663541ab5 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -182,6 +182,8 @@
<flag name='usb-mtp'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6002000</version>
<microcodeVersion>43100244</microcodeVersion>
<package>v6.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index 8bdb26e8a4..00cb533f85 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -161,6 +161,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6002092</version>
<microcodeVersion>61700243</microcodeVersion>
<package>v7.0.0-rc2</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index 697c1c255a..e1afe4f253 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -161,6 +161,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>6002092</version>
<microcodeVersion>61700243</microcodeVersion>
<package>v7.0.0-rc2</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index e02f42c5e0..4754f9f476 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -159,6 +159,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7000000</version>
<microcodeVersion>42900243</microcodeVersion>
<package>v7.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index fd317a9afa..69e1dd112c 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -190,6 +190,8 @@
<flag name='acpi-erst'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7000000</version>
<microcodeVersion>43100243</microcodeVersion>
<package>v7.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 427aa1ace9..3656739f32 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -160,6 +160,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7001000</version>
<microcodeVersion>42900244</microcodeVersion>
<package>v7.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 32e4e8e1bb..a6040acbeb 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -195,6 +195,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7001000</version>
<microcodeVersion>43100244</microcodeVersion>
<package>v7.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index 56cb66d394..8d1c49ae8d 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -155,6 +155,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7002000</version>
<microcodeVersion>0</microcodeVersion>
<package>qemu-7.2.0-6.fc37</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 0ebcb94a31..168fe1d0c9 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -199,6 +199,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7002000</version>
<microcodeVersion>43100245</microcodeVersion>
<package>v7.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index 025ced01d9..09d99ec0ee 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -199,6 +199,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7002000</version>
<microcodeVersion>43100245</microcodeVersion>
<package>v7.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 0207637ebc..35f3ba11a5 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -143,6 +143,8 @@
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
<flag name='machine.virt.aia'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>7002050</version>
<microcodeVersion>0</microcodeVersion>
<package>v7.2.0-333-g222059a0fc</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 5f45788b77..27d5bd1b8f 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -203,6 +203,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8000000</version>
<microcodeVersion>43100244</microcodeVersion>
<package>v8.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 7dee7f94c2..12912d9a15 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -205,6 +205,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8001000</version>
<microcodeVersion>43100245</microcodeVersion>
<package>v8.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index 78082dbf3f..beb384abce 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -170,6 +170,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8002000</version>
<microcodeVersion>61700246</microcodeVersion>
<package>v8.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index 912eb45db6..8dac79438d 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -177,6 +177,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8002000</version>
<microcodeVersion>0</microcodeVersion>
<package>qemu-8.2.0-7.fc39</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
index 60b980e256..ab2a6da20e 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@@ -160,6 +160,8 @@
<flag name='netdev.user'/>
<flag name='acpi-erst'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8002000</version>
<microcodeVersion>106300246</microcodeVersion>
<package>v8.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index 8f36104080..ad77169fc4 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@@ -124,6 +124,8 @@
<flag name='virtio-sound'/>
<flag name='netdev.user'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8002000</version>
<microcodeVersion>39100246</microcodeVersion>
<package>v8.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index 51e14736cd..fbbc1af5db 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@@ -208,6 +208,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>8002000</version>
<microcodeVersion>43100246</microcodeVersion>
<package>v8.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index 4b64547b11..7fcbc8e351 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -210,6 +210,8 @@
<flag name='intel-iommu.dma-translation'/>
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9000000</version>
<microcodeVersion>43100245</microcodeVersion>
<package>v9.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
index ccc7673ba9..5d534cb2ea 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@@ -170,6 +170,8 @@
<flag name='snapshot-internal-qmp'/>
<flag name='migrate-incoming.exit-on-error'/>
<flag name='machine.virt.aia'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9001000</version>
<microcodeVersion>0</microcodeVersion>
<package>v9.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
index a20b63051e..269eb9f67e 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@@ -135,6 +135,8 @@
<flag name='snapshot-internal-qmp'/>
<flag name='query-cpu-model-expansion.deprecated-props'/>
<flag name='migrate-incoming.exit-on-error'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9001000</version>
<microcodeVersion>39100246</microcodeVersion>
<package>v9.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
index 196bab7797..1f7005fd76 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@@ -209,6 +209,8 @@
<flag name='machine-i8042-opt'/>
<flag name='snapshot-internal-qmp'/>
<flag name='migrate-incoming.exit-on-error'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9001000</version>
<microcodeVersion>43100246</microcodeVersion>
<package>v9.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
index 767a95bd3e..be52af4ccc 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@@ -138,6 +138,8 @@
<flag name='netdev-stream-reconnect-miliseconds'/>
<flag name='query-cpu-model-expansion.deprecated-props'/>
<flag name='migrate-incoming.exit-on-error'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9001050</version>
<microcodeVersion>39100247</microcodeVersion>
<package>v9.1.0-1348-g11b8920ed2</package>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
index 824504dba0..5c647f19c8 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@@ -211,6 +211,8 @@
<flag name='chardev-reconnect-miliseconds'/>
<flag name='netdev-stream-reconnect-miliseconds'/>
<flag name='migrate-incoming.exit-on-error'/>
+ <flag name='nvme'/>
+ <flag name='nvme-ns'/>
<version>9002000</version>
<microcodeVersion>43100247</microcodeVersion>
<package>v9.2.0</package>
--
2.11.0
