External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: deprecate QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC

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 bdd92827d3
commit 53f9437748
29 changed files with 2 additions and 36 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_CACHE_DIRECTSYNC);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY);

2
src/qemu/qemu_capabilities.h
View File

@ -139,7 +139,7 @@ typedef enum {
QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */
/* 65 */
QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, /* Is cache=directsync supported? */
X_QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, /* Is cache=directsync supported? */
QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */
QEMU_CAPS_PIIX4_USB_UHCI, /* -device piix4-usb-uhci */
QEMU_CAPS_USB_EHCI, /* -device usb-ehci */

7
src/qemu/qemu_command.c
View File

@ -1348,13 +1348,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk,
return -1;
}
if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_DIRECTSYNC &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("disk cache mode 'directsync' is not supported by this QEMU"));
return -1;
}
if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_UNSAFE &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -10,7 +10,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -10,7 +10,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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='cache-directsync'/>
<flag name='no-shutdown'/>
<flag name='cache-unsafe'/>
<flag name='fsdev-readonly'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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='cache-directsync'/>
<flag name='no-shutdown'/>
<flag name='cache-unsafe'/>
<flag name='fsdev-readonly'/>

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

@ -10,7 +10,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -10,7 +10,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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='cache-directsync'/>
<flag name='no-shutdown'/>
<flag name='cache-unsafe'/>
<flag name='fsdev-readonly'/>

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

@ -16,7 +16,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -12,7 +12,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -10,7 +10,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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='cache-directsync'/>
<flag name='no-shutdown'/>
<flag name='cache-unsafe'/>
<flag name='fsdev-readonly'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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='cache-directsync'/>
<flag name='no-shutdown'/>
<flag name='cache-unsafe'/>
<flag name='fsdev-readonly'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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

@ -10,7 +10,6 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

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='cache-directsync'/>
<flag name='no-shutdown'/>
<flag name='cache-unsafe'/>
<flag name='fsdev-readonly'/>

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

@ -18,7 +18,6 @@
<flag name='sga'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
<flag name='cache-directsync'/>
<flag name='piix3-usb-uhci'/>
<flag name='piix4-usb-uhci'/>
<flag name='usb-ehci'/>

3
tests/qemuxml2argvtest.c
View File

@ -948,8 +948,7 @@ mymain(void)
DO_TEST("disk-drive-cache-v2-wt", NONE);
DO_TEST("disk-drive-cache-v2-wb", NONE);
DO_TEST("disk-drive-cache-v2-none", NONE);
DO_TEST("disk-drive-cache-directsync",
QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
DO_TEST("disk-drive-cache-directsync", NONE);
DO_TEST("disk-drive-cache-unsafe",
QEMU_CAPS_DRIVE_CACHE_UNSAFE);
DO_TEST("disk-drive-copy-on-read",