提交 f06d7daa 编写于 作者: P Peter Krempa

qemu: blockjob: Call qemuDomainSupportsBlockJobs only on online VMs

Since the qemu capabilities are not initialized for offline VMs the
caller might get suboptimal error message:

$ virsh blockjob VM PATH --bandwidth 1
error: unsupported configuration: block jobs not supported with this QEMU binary

Move the checks after we make sure that the VM is alive.
上级 62802945
...@@ -16555,34 +16555,34 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, ...@@ -16555,34 +16555,34 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not running"));
goto endjob;
}
if (qemuDomainSupportsBlockJobs(vm, &modern) < 0)
goto endjob;
if (!modern) { if (!modern) {
if (base) { if (base) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("partial block pull not supported with this " _("partial block pull not supported with this "
"QEMU binary")); "QEMU binary"));
goto cleanup; goto endjob;
} }
if (bandwidth) { if (bandwidth) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting bandwidth at start of block pull not " _("setting bandwidth at start of block pull not "
"supported with this QEMU binary")); "supported with this QEMU binary"));
goto cleanup; goto endjob;
} }
} }
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not running"));
goto endjob;
}
if (!(device = qemuDiskPathToAlias(vm, path, &idx))) if (!(device = qemuDiskPathToAlias(vm, path, &idx)))
goto endjob; goto endjob;
disk = vm->def->disks[idx]; disk = vm->def->disks[idx];
...@@ -16682,9 +16682,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, ...@@ -16682,9 +16682,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
if (virDomainBlockJobAbortEnsureACL(dom->conn, vm->def) < 0) if (virDomainBlockJobAbortEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSupportsBlockJobs(vm, &modern) < 0)
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
...@@ -16694,6 +16691,9 @@ qemuDomainBlockJobAbort(virDomainPtr dom, ...@@ -16694,6 +16691,9 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (qemuDomainSupportsBlockJobs(vm, &modern) < 0)
goto endjob;
if (!(device = qemuDiskPathToAlias(vm, path, &idx))) if (!(device = qemuDiskPathToAlias(vm, path, &idx)))
goto endjob; goto endjob;
disk = vm->def->disks[idx]; disk = vm->def->disks[idx];
...@@ -16896,9 +16896,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, ...@@ -16896,9 +16896,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom,
if (virDomainBlockJobSetSpeedEnsureACL(dom->conn, vm->def) < 0) if (virDomainBlockJobSetSpeedEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSupportsBlockJobs(vm, &modern) < 0)
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
...@@ -16908,6 +16905,9 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, ...@@ -16908,6 +16905,9 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (qemuDomainSupportsBlockJobs(vm, &modern) < 0)
goto endjob;
if (!(device = qemuDiskPathToAlias(vm, path, NULL))) if (!(device = qemuDiskPathToAlias(vm, path, NULL)))
goto endjob; goto endjob;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册