From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 1 Nov 2017 10:47:19 +0000 (+0100)
Subject: qemu: command: Move blkiotune checks to qemuCheckDiskConfig
X-Git-Tag: v3.10.0-rc1~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1fcd7b51f09c398566f3e12570dd2663075afe;p=thirdparty%2Flibvirt.git

qemu: command: Move blkiotune checks to qemuCheckDiskConfig
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6d27237452..1c8e3d6838 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1221,6 +1221,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);
@@ -1782,9 +1785,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", \