提交 5d2691cc 编写于 作者: P Peter Krempa

qemu: blockjob: Print correct file name in error message

When attempting a blockcommit from the top layer, the base argument
passed is NULL. This will be dereferenced when attempting a commit with
an empty image chain. Output the real volume path instead:

virsh blockcommit --verbose --path vda --domain DOMNAME --wait
error: invalid argument: top '/path/somefile' in chain for 'vda' has no backing file

instead of:

error: invalid argument: top '(null)' in chain for 'vda' has no backing file
上级 cc3d335b
...@@ -15180,7 +15180,7 @@ qemuDomainBlockCommit(virDomainPtr dom, const char *path, const char *base, ...@@ -15180,7 +15180,7 @@ qemuDomainBlockCommit(virDomainPtr dom, const char *path, const char *base,
if (!top_meta || !top_meta->backingStore) { if (!top_meta || !top_meta->backingStore) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("top '%s' in chain for '%s' has no backing file"), _("top '%s' in chain for '%s' has no backing file"),
top, path); top_canon, path);
goto endjob; goto endjob;
} }
if (!base && (flags & VIR_DOMAIN_BLOCK_COMMIT_SHALLOW)) { if (!base && (flags & VIR_DOMAIN_BLOCK_COMMIT_SHALLOW)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册