External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: deprecate QEMU_CAPS_FSDEV_READONLY

Browse Source 
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 12:51:55 +02:00
parent 0de90bd710
commit dd924fb05c
28 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -3626,7 +3626,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);

2
src/qemu/qemu_capabilities.h
View File

@ -157,7 +157,7 @@ typedef enum {
X_QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */
QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
QEMU_CAPS_NO_ACPI, /* -no-acpi */
QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
X_QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
/* 80 */
QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */

12
src/qemu/qemu_command.c
View File

@ -2371,16 +2371,8 @@ qemuBuildFSStr(virDomainFSDefPtr fs,
virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias);
virBufferAsprintf(&opt, ",path=%s", fs->src->path);
if (fs->readonly) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV_READONLY)) {
virBufferAddLit(&opt, ",readonly");
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("readonly filesystem is not supported by this "
"QEMU binary"));
goto error;
}
}
if (fs->readonly)
virBufferAddLit(&opt, ",readonly");
if (virBufferCheckError(&opt) < 0)
goto error;

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -19,7 +19,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -18,7 +18,6 @@
<flag name='pci-ohci'/>
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -19,7 +19,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -18,7 +18,6 @@
<flag name='pci-ohci'/>
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -26,7 +26,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -21,7 +21,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -18,7 +18,6 @@
<flag name='pci-ohci'/>
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -18,7 +18,6 @@
<flag name='pci-ohci'/>
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -28,7 +28,6 @@
<flag name='usb-hub'/>
<flag name='ich9-ahci'/>
<flag name='no-acpi'/>
<flag name='fsdev-readonly'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='drive-copy-on-read'/>
<flag name='fsdev-writeout'/>