|
 |
fbe740 |
From 3d20773c3ab225449f1977b064d779adf316853c Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <3d20773c3ab225449f1977b064d779adf316853c@dist-git>
|
|
|
fbe740 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
fbe740 |
Date: Wed, 1 Apr 2020 17:19:26 +0200
|
|
|
fbe740 |
Subject: [PATCH] qemu: add QEMU_CAPS_STORAGE_WERROR
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
Detect the werror property on SCSI and virtio disks.
|
|
|
fbe740 |
But clear it if the QEMU supports usb-storage device without it
|
|
|
fbe740 |
also supporting this option for usb-storage.
|
|
|
fbe740 |
|
|
|
fbe740 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
(cherry picked from commit 47e84b06ec8181cbdb00c87bcc67f20edd9e949b)
|
|
|
fbe740 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
|
|
|
fbe740 |
https://bugzilla.redhat.com/show_bug.cgi?id=1819250
|
|
|
fbe740 |
|
|
|
fbe740 |
Conflicts: src/qemu/qemu_capabilities.c
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
|
|
|
fbe740 |
different capablility sets
|
|
|
fbe740 |
Message-Id: <67c670e206dd05aac31b86cac1f42e2f37b366e5.1585754141.git.jtomko@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_capabilities.c | 10 +++++++++-
|
|
|
fbe740 |
src/qemu/qemu_capabilities.h | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 +
|
|
|
fbe740 |
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
|
|
|
fbe740 |
26 files changed, 34 insertions(+), 1 deletion(-)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
fbe740 |
index 0b4ed4253c..9d744501b9 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
fbe740 |
@@ -563,7 +563,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
|
|
fbe740 |
"blockdev-reopen",
|
|
|
fbe740 |
|
|
|
fbe740 |
/* 355 */
|
|
|
fbe740 |
- "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api"
|
|
|
fbe740 |
+ "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api",
|
|
|
fbe740 |
+ "storage.werror",
|
|
|
fbe740 |
);
|
|
|
fbe740 |
|
|
|
fbe740 |
|
|
|
fbe740 |
@@ -1299,6 +1300,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBlk[] = {
|
|
|
fbe740 |
{ "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM },
|
|
|
fbe740 |
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
|
|
|
fbe740 |
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE },
|
|
|
fbe740 |
+ { "werror", QEMU_CAPS_STORAGE_WERROR },
|
|
|
fbe740 |
};
|
|
|
fbe740 |
|
|
|
fbe740 |
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] = {
|
|
|
fbe740 |
@@ -1334,6 +1336,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIDisk[] = {
|
|
|
fbe740 |
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW },
|
|
|
fbe740 |
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE },
|
|
|
fbe740 |
{ "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID },
|
|
|
fbe740 |
+ { "werror", QEMU_CAPS_STORAGE_WERROR },
|
|
|
fbe740 |
};
|
|
|
fbe740 |
|
|
|
fbe740 |
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsIDEDrive[] = {
|
|
|
fbe740 |
@@ -4811,6 +4814,11 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCapsPtr qemuCaps)
|
|
|
fbe740 |
{
|
|
|
fbe740 |
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
|
|
|
fbe740 |
virQEMUCapsClear(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE) &&
|
|
|
fbe740 |
+ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_WERROR)) {
|
|
|
fbe740 |
+ virQEMUCapsClear(qemuCaps, QEMU_CAPS_STORAGE_WERROR);
|
|
|
fbe740 |
+ }
|
|
|
fbe740 |
}
|
|
|
fbe740 |
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
fbe740 |
index 0f7c586703..78bddb3856 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
fbe740 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
fbe740 |
@@ -545,6 +545,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
|
fbe740 |
|
|
|
fbe740 |
/* 355 */
|
|
|
fbe740 |
QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
|
|
|
fbe740 |
+ QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
|
|
|
fbe740 |
|
|
|
fbe740 |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
fbe740 |
} virQEMUCapsFlags;
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
|
|
|
fbe740 |
index aa9027d514..04ac872985 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
|
|
|
fbe740 |
@@ -106,6 +106,7 @@
|
|
|
fbe740 |
<flag name='iothread.poll-max-ns'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-baseline'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>2010000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100287</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
|
|
|
fbe740 |
index db51d461a8..6d36a6e484 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
|
|
|
fbe740 |
@@ -113,6 +113,7 @@
|
|
|
fbe740 |
<flag name='iothread.poll-max-ns'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-baseline'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>2011000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100288</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
fbe740 |
index cbbe24823a..21a168dd3b 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
fbe740 |
@@ -125,6 +125,7 @@
|
|
|
fbe740 |
<flag name='query-cpu-model-baseline'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>2012000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100289</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
fbe740 |
index 762ce4946e..17351ca6bf 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
fbe740 |
@@ -90,6 +90,7 @@
|
|
|
fbe740 |
<flag name='virtual-css-bridge'/>
|
|
|
fbe740 |
<flag name='sdl-gl'/>
|
|
|
fbe740 |
<flag name='zpci'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>2007000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100245</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
fbe740 |
index 6000bed682..d204b82030 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
fbe740 |
@@ -95,6 +95,7 @@
|
|
|
fbe740 |
<flag name='zpci'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-baseline'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>2007093</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100246</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
|
|
|
fbe740 |
index 95251de022..9a6d94d37b 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
|
|
|
fbe740 |
@@ -100,6 +100,7 @@
|
|
|
fbe740 |
<flag name='iothread.poll-max-ns'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-baseline'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>2009000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100247</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
|
|
|
fbe740 |
index 0b507ec80e..6814a2f9c6 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
|
|
|
fbe740 |
@@ -95,6 +95,7 @@
|
|
|
fbe740 |
<flag name='memory-backend-file.align'/>
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>3000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>0</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
|
|
|
fbe740 |
index 0d7c589f71..b81f5825cc 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
|
|
|
fbe740 |
@@ -95,6 +95,7 @@
|
|
|
fbe740 |
<flag name='memory-backend-file.align'/>
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>3000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>0</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
|
|
|
fbe740 |
index da57f8738b..85cda12076 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
|
|
|
fbe740 |
@@ -128,6 +128,7 @@
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>3000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100239</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
fbe740 |
index c955994ac0..575b1c2a43 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
fbe740 |
@@ -202,6 +202,7 @@
|
|
|
fbe740 |
<flag name='bochs-display'/>
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>3000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>43100239</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
|
fbe740 |
index cab38d442b..591f054193 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
|
fbe740 |
@@ -159,6 +159,7 @@
|
|
|
fbe740 |
<flag name='overcommit'/>
|
|
|
fbe740 |
<flag name='bochs-display'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>3000091</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>42900240</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
|
|
|
fbe740 |
index 3e89d7f933..6e434579ff 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
|
|
|
fbe740 |
@@ -205,6 +205,7 @@
|
|
|
fbe740 |
<flag name='bochs-display'/>
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>3000092</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>43100240</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
|
|
|
fbe740 |
index 757bf193fc..6fd1880ae2 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
|
|
|
fbe740 |
@@ -169,6 +169,7 @@
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='arm-max-cpu'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>61700240</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
|
|
|
fbe740 |
index 4e13888042..aa22eccc6f 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
|
|
|
fbe740 |
@@ -173,6 +173,7 @@
|
|
|
fbe740 |
<flag name='migration-file-drop-cache'/>
|
|
|
fbe740 |
<flag name='machine.pseries.cap-ccf-assist'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>42900240</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
|
|
|
fbe740 |
index 7d3a1bec6f..6a567239b9 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
|
|
|
fbe740 |
@@ -170,6 +170,7 @@
|
|
|
fbe740 |
<flag name='bochs-display'/>
|
|
|
fbe740 |
<flag name='migration-file-drop-cache'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>0</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
|
|
|
fbe740 |
index 1732139db8..d6686b7c68 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
|
|
|
fbe740 |
@@ -170,6 +170,7 @@
|
|
|
fbe740 |
<flag name='bochs-display'/>
|
|
|
fbe740 |
<flag name='migration-file-drop-cache'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>0</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
|
|
|
fbe740 |
index fd124ce0c5..9dc29832f9 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
|
|
|
fbe740 |
@@ -136,6 +136,7 @@
|
|
|
fbe740 |
<flag name='query-cpu-model-baseline'/>
|
|
|
fbe740 |
<flag name='query-cpu-model-comparison'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100240</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
|
|
|
fbe740 |
index ba32d4c592..3c1baf9560 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
|
|
|
fbe740 |
@@ -210,6 +210,7 @@
|
|
|
fbe740 |
<flag name='migration-file-drop-cache'/>
|
|
|
fbe740 |
<flag name='ramfb'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4000000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>43100240</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
|
|
|
fbe740 |
index 54b797a86a..d5f2673fb6 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
|
|
|
fbe740 |
@@ -216,6 +216,7 @@
|
|
|
fbe740 |
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
<flag name='smp-dies'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4001000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>43100241</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
|
|
|
fbe740 |
index 55fa169d89..75f9bc3158 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
|
|
|
fbe740 |
@@ -178,6 +178,7 @@
|
|
|
fbe740 |
<flag name='smp-dies'/>
|
|
|
fbe740 |
<flag name='virtio-net.failover'/>
|
|
|
fbe740 |
<flag name='vhost-user-fs'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4001050</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>61700242</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
|
|
|
fbe740 |
index 7c62546d74..f5121fca94 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
|
|
|
fbe740 |
@@ -177,6 +177,7 @@
|
|
|
fbe740 |
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
<flag name='smp-dies'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4001050</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>42900242</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
fbe740 |
index 49963b7020..59cb9200cb 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
fbe740 |
@@ -137,6 +137,7 @@
|
|
|
fbe740 |
<flag name='drive-nvme'/>
|
|
|
fbe740 |
<flag name='smp-dies'/>
|
|
|
fbe740 |
<flag name='vhost-user-fs'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4001050</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>39100242</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
|
|
|
fbe740 |
index ed3dea23b3..f6df71ff3e 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
|
|
|
fbe740 |
@@ -221,6 +221,7 @@
|
|
|
fbe740 |
<flag name='smp-dies'/>
|
|
|
fbe740 |
<flag name='virtio-net.failover'/>
|
|
|
fbe740 |
<flag name='vhost-user-fs'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4002000</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>43100242</microcodeVersion>
|
|
|
fbe740 |
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
|
fbe740 |
index 8195da4e27..140a466910 100644
|
|
|
fbe740 |
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
|
fbe740 |
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
|
fbe740 |
@@ -180,6 +180,7 @@
|
|
|
fbe740 |
<flag name='virtio-net.failover'/>
|
|
|
fbe740 |
<flag name='cpu.kvm-no-adjvtime'/>
|
|
|
fbe740 |
<flag name='vhost-user-fs'/>
|
|
|
fbe740 |
+ <flag name='storage.werror'/>
|
|
|
fbe740 |
<version>4002050</version>
|
|
|
fbe740 |
<kvmVersion>0</kvmVersion>
|
|
|
fbe740 |
<microcodeVersion>61700241</microcodeVersion>
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.26.2
|
|
|
fbe740 |
|