From: Hyman Huang(黄勇) <yong.huang@xxxxxxxxxx>
DISCARD and WRITE_ZEROES commands has been implemented in virtio-blk
protocol since qemu >= 4.2.0.
Introduce QEMU_CAPS_VIRTIO_BLK_DISCARD and QEMU_CAPS_VIRTIO_BLK_WRITE_ZEROES
capability definitions.
Signed-off-by: Hyman Huang(黄勇) <yong.huang@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 4 ++++
src/qemu/qemu_capabilities.h | 2 ++
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 ++
tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml | 2 ++
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 2 ++
tests/qemucapabilitiesdata/caps_5.1.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_s390x.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_s390x.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_s390x.xml | 2 ++
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 2 ++
36 files changed, 74 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c9f4b17208..b11bac95e6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -697,6 +697,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 450 */
"run-with.async-teardown", /* QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN */
+ "virtio-blk.discard", /* QEMU_CAPS_VIRTIO_BLK_DISCARD */
+ "virtio-blk.write-zeroes", /* QEMU_CAPS_VIRTIO_BLK_WRITE_ZEROES */
);
@@ -1422,6 +1424,8 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
{ "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault },
{ "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
+ { "discard", QEMU_CAPS_VIRTIO_BLK_DISCARD, NULL },
+ { "write-zeroes", QEMU_CAPS_VIRTIO_BLK_WRITE_ZEROES, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 2460fa7fa0..bcf0aaa0a5 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -676,6 +676,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 450 */
QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN, /* asynchronous teardown -run-with async-teardown=on|off */
+ QEMU_CAPS_VIRTIO_BLK_DISCARD, /* virtio-blk-*.discard */
+ QEMU_CAPS_VIRTIO_BLK_WRITE_ZEROES, /* virtio-blk-*.write-zeroes */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index 6a7f33e3c6..3823eb7994 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -111,6 +111,8 @@
<flag name='virtio-blk.queue-size'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>4002000</version>
<microcodeVersion>61700242</microcodeVersion>
<package>v4.1.0-2221-g36609b4fa3</package>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index 2064f07c9c..0760733c7b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -110,6 +110,8 @@
<flag name='virtio-blk.queue-size'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>4002000</version>
<microcodeVersion>42900242</microcodeVersion>
<package>v4.1.0-2198-g9e583f2</package>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
index b440d9d538..8a0c687cb6 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
@@ -75,6 +75,8 @@
<flag name='virtio-blk.queue-size'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>4002000</version>
<microcodeVersion>39100242</microcodeVersion>
<package>qemu-4.2.0-20200115.0.1e4aa2da.fc31</package>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index b45d4a6293..782adba95e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -153,6 +153,8 @@
<flag name='virtio-blk.queue-size'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>4002000</version>
<microcodeVersion>43100242</microcodeVersion>
<package>v4.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index a2b7214b8a..e9f8e51575 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -123,6 +123,8 @@
<flag name='virtio-iommu-pci'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5000000</version>
<microcodeVersion>61700241</microcodeVersion>
<package>v5.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index 16333ba499..7d59efba65 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -125,6 +125,8 @@
<flag name='virtio-iommu-pci'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5000000</version>
<microcodeVersion>42900241</microcodeVersion>
<package>v5.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index 09a71875ef..6bceb233ba 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -118,6 +118,8 @@
<flag name='virtio-iommu-pci'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5000000</version>
<microcodeVersion>0</microcodeVersion>
<package>v5.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index 5331cf0113..815d9c2dd9 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -162,6 +162,8 @@
<flag name='virtio-iommu-pci'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5000000</version>
<microcodeVersion>43100241</microcodeVersion>
<package>v5.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index 1c3d3ea2a9..9633013da0 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -166,6 +166,8 @@
<flag name='virtio-net.rss'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5001000</version>
<microcodeVersion>43100242</microcodeVersion>
<package>v5.1.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index b1c5c21abb..33ca4417e7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -130,6 +130,8 @@
<flag name='virtio-net.rss'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 9db85dafef..449f29bcb1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -130,6 +130,8 @@
<flag name='virtio-net.rss'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 4d03004fa1..ad5e839c34 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -123,6 +123,8 @@
<flag name='virtio-net.rss'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5002000</version>
<microcodeVersion>0</microcodeVersion>
<package>v5.2.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
index 38a3f70a5e..0551691fd5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
@@ -86,6 +86,8 @@
<flag name='virtio-iommu-pci'/>
<flag name='virtio-net.rss'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>5002000</version>
<microcodeVersion>39100243</microcodeVersion>
<package>qemu-5.2.0-20201215.0.ba93e22c.fc32</package>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 654fec58fe..4ec76f6b96 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -170,6 +170,8 @@
<flag name='virtio-net.rss'/>
<flag name='usb-host.guest-resets-all'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 6faf407a97..2e91b53f9d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -140,6 +140,8 @@
<flag name='migration.blocked-reasons'/>
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>6000000</version>
<microcodeVersion>61700242</microcodeVersion>
<package>v6.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index a63263e7e5..3563ff6384 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@@ -95,6 +95,8 @@
<flag name='virtio-net.rss'/>
<flag name='migration.blocked-reasons'/>
<flag name='virtio-crypto'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>6000000</version>
<microcodeVersion>39100242</microcodeVersion>
<package>qemu-6.0.0-20210517.1.4ff77070.fc33</package>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index b1bf3caecf..12d6f27dc8 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -181,6 +181,8 @@
<flag name='migration.blocked-reasons'/>
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 13d909e382..ab00c9d5b4 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -187,6 +187,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 e312801b89..7576a264b2 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -153,6 +153,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 e6b0bc03f4..45603b5524 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -143,6 +143,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 e1758396b0..e9cc950482 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -189,6 +189,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 3517e81d15..27e1787c07 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='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 58db75d1d7..eadd9ea74a 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='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 40130f180f..7c7cad17ba 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -161,6 +161,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 b7446435a6..4da26727e4 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -195,6 +195,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 6bc39b85f7..f04fabf02d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -161,6 +161,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 6492695705..4e6a7a62bf 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -198,6 +198,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 f190be552a..5caff5c357 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -156,6 +156,8 @@
<flag name='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 c08a99e734..3411580ee9 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -202,6 +202,8 @@
<flag name='cryptodev-backend-lkcf'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 37933c0848..f29f0d256a 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -202,6 +202,8 @@
<flag name='cryptodev-backend-lkcf'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 4c5e72ba56..2cf4d08ab5 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='virtio-crypto'/>
<flag name='pvpanic-pci'/>
<flag name='virtio-gpu.blob'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<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 cd5341f4fa..3c0301b489 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -206,6 +206,8 @@
<flag name='virtio-gpu.blob'/>
<flag name='rbd-encryption-layering'/>
<flag name='rbd-encryption-luks-any'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>8000000</version>
<microcodeVersion>43100244</microcodeVersion>
<package>v8.0.0</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 88c7ac89db..d473b47c80 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -115,6 +115,8 @@
<flag name='rbd-encryption-layering'/>
<flag name='rbd-encryption-luks-any'/>
<flag name='run-with.async-teardown'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>8000050</version>
<microcodeVersion>39100245</microcodeVersion>
<package>v8.0.0-1270-g1c12355b</package>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 475496a8c8..45485b4086 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -207,6 +207,8 @@
<flag name='rbd-encryption-luks-any'/>
<flag name='qcow2-discard-no-unref'/>
<flag name='run-with.async-teardown'/>
+ <flag name='virtio-blk.discard'/>
+ <flag name='virtio-blk.write-zeroes'/>
<version>8000050</version>
<microcodeVersion>43100245</microcodeVersion>
<package>v8.0.0-1739-g5f9dd6a8ce</package>
--
2.38.5
