External/libvirt
1
0
Fork 0
Code

qemu: command: Move blkiotune checks to qemuCheckDiskConfig

Browse Source
This commit is contained in:
Peter Krempa 2017-11-01 11:47:19 +01:00
parent 5121457cad
commit cf1fcd7b51
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_command.c
View File

@ -1221,6 +1221,9 @@ int
qemuCheckDiskConfig(virDomainDiskDefPtr disk, qemuCheckDiskConfig(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
if (qemuCheckDiskConfigBlkdeviotune(disk, qemuCaps) < 0)
return -1;
if (virDiskNameToIndex(disk->dst) < 0) { if (virDiskNameToIndex(disk->dst) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unsupported disk type '%s'"), disk->dst); _("unsupported disk type '%s'"), disk->dst);
@ -1782,9 +1785,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
virDomainDiskIoTypeToString(disk->iomode)); virDomainDiskIoTypeToString(disk->iomode));
} }
if (qemuCheckDiskConfigBlkdeviotune(disk, qemuCaps) < 0)
goto error;
#define IOTUNE_ADD(_field, _label) \ #define IOTUNE_ADD(_field, _label) \
if (disk->blkdeviotune._field) { \ if (disk->blkdeviotune._field) { \
virBufferAsprintf(&opt, ",throttling." _label "=%llu", \ virBufferAsprintf(&opt, ",throttling." _label "=%llu", \