qemu: command: -drive formatting cleanups (blockdev-add saga)

[libvirt] [PATCH 8/9] qemu: command: Move blkiotune checks to qemuCheckDiskConfig

Posted by Peter Krempa 7 years, 6 months ago

---
 src/qemu/qemu_command.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index cfd9ef9e2..507401d3f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1220,6 +1220,9 @@ int
 qemuCheckDiskConfig(virDomainDiskDefPtr disk,
                     virQEMUCapsPtr qemuCaps)
 {
+    if (qemuCheckDiskConfigBlkdeviotune(disk, qemuCaps) < 0)
+        return -1;
+
     if (virDiskNameToIndex(disk->dst) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unsupported disk type '%s'"), disk->dst);
@@ -1781,9 +1784,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
                           virDomainDiskIoTypeToString(disk->iomode));
     }

-    if (qemuCheckDiskConfigBlkdeviotune(disk, qemuCaps) < 0)
-        goto error;
-
 #define IOTUNE_ADD(_field, _label)                                             \
     if (disk->blkdeviotune._field) {                                           \
         virBufferAsprintf(&opt, ",throttling." _label "=%llu",                 \
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list