External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: deprecate QEMU_CAPS_DRIVE_COPY_ON_READ

Browse Source 
Implied by QEMU >= 1.2.0.

Also delete the now redundant disk-drive-copy-on-read test.

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 dd924fb05c
commit 08ad06ca68
30 changed files with 1 additions and 65 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_DRIVE_COPY_ON_READ);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);

2
src/qemu/qemu_capabilities.h
View File

@ -162,7 +162,7 @@ typedef enum {
/* 80 */
QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */
X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */
QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */
X_QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */
X_QEMU_CAPS_CPU_HOST, /* support for -cpu host */
QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */

7
src/qemu/qemu_command.c
View File

@ -1348,13 +1348,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk,
return -1;
}
if (disk->copy_on_read &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("copy_on_read is not supported by this QEMU binary"));
return -1;
}
if (disk->discard &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

28
tests/qemuxml2argvdata/disk-drive-copy-on-read.args
View File

@ -1,28 +0,0 @@
LC_ALL=C \
PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
-m 214 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-boot c \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\
copy-on-read=on \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

3
tests/qemuxml2argvtest.c
View File

@ -950,8 +950,6 @@ mymain(void)
DO_TEST("disk-drive-cache-v2-none", NONE);
DO_TEST("disk-drive-cache-directsync", NONE);
DO_TEST("disk-drive-cache-unsafe", NONE);
DO_TEST("disk-drive-copy-on-read",
QEMU_CAPS_DRIVE_COPY_ON_READ);
DO_TEST("disk-drive-network-nbd", NONE);
DO_TEST("disk-drive-network-nbd-export", NONE);
DO_TEST("disk-drive-network-nbd-ipv6", NONE);
@ -1036,7 +1034,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TX_ALG,
QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST("disk-copy_on_read",
QEMU_CAPS_DRIVE_COPY_ON_READ,
QEMU_CAPS_VIRTIO_TX_ALG,
QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST("disk-drive-discard",