Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 12 ++----------
src/qemu/qemu_capabilities.h | 4 ++--
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 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 | 1 -
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.sparc.xml | 1 -
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 | 1 -
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 | 1 -
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.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 --
35 files changed, 4 insertions(+), 73 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index bc99f3cdcc..7e01be3f5f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -507,7 +507,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 310 */
"machine.pseries.cap-htm", /* QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */
- "usb-storage.werror", /* QEMU_CAPS_USB_STORAGE_WERROR */
+ "usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */
"egl-headless", /* QEMU_CAPS_EGL_HEADLESS */
"vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */
"blockdev", /* QEMU_CAPS_BLOCKDEV */
@@ -573,7 +573,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"query-named-block-nodes.flat", /* QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT */
"blockdev-snapshot.allow-write-only-overlay", /* QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */
"blockdev-reopen", /* QEMU_CAPS_BLOCKDEV_REOPEN */
- "storage.werror", /* QEMU_CAPS_STORAGE_WERROR */
+ "storage.werror", /* X_QEMU_CAPS_STORAGE_WERROR */
/* 360 */
"fsdev.multidevs", /* QEMU_CAPS_FSDEV_MULTIDEVS */
@@ -1441,7 +1441,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
{ "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
- { "werror", QEMU_CAPS_STORAGE_WERROR, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
};
@@ -1486,7 +1485,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
{ "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID, NULL },
- { "werror", QEMU_CAPS_STORAGE_WERROR, NULL },
{ "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL },
};
@@ -1518,7 +1516,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {
{ "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL },
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
- { "werror", QEMU_CAPS_USB_STORAGE_WERROR, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = {
@@ -5251,11 +5248,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE) &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_WERROR)) {
- virQEMUCapsClear(qemuCaps, QEMU_CAPS_STORAGE_WERROR);
- }
-
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 1bf4c1a97f..45bf8fb9ed 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -482,7 +482,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 310 */
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
- QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
+ X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */
@@ -548,7 +548,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT, /* query-named-block-nodes supports the 'flat' option */
QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
- QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
+ X_QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
/* 360 */
QEMU_CAPS_FSDEV_MULTIDEVS, /* fsdev.multidevs */
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index b53e3f0273..44c502a570 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -114,7 +114,6 @@
<flag name='tpm-emulator'/>
<flag name='machine.pseries.cap-hpt-max-page-size'/>
<flag name='machine.pseries.cap-htm'/>
- <flag name='usb-storage.werror'/>
<flag name='egl-headless'/>
<flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
@@ -126,7 +125,6 @@
<flag name='bochs-display'/>
<flag name='drive-nvme'/>
<flag name='i8042'/>
- <flag name='storage.werror'/>
<flag name='machine.pseries.cap-cfpc'/>
<flag name='machine.pseries.cap-sbbc'/>
<flag name='machine.pseries.cap-ibs'/>
[snipped]
