Re: [libvirt] [PATCH 3/5] qemu: blockcopy: reuse storage driver APIs to pre-create copy target

On 07/11/2017 11:46 AM, Peter Krempa wrote: > Rather than using the local-file only implementation 'qemuOpenFile' > switch to the imagelabel aware storage driver implementation. > --- > src/qemu/qemu_driver.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index d00166f23..48dc5e5cc 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c

> @@ -16880,8 +16885,10 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, > vm->def->name); > > endjob: > - if (need_unlink && unlink(mirror->path)) > - VIR_WARN("unable to unlink just-created %s", mirror->path); > + if (need_unlink && virStorageFileUnlink(mirror)) ...Unlink(mirror) < 0) > + VIR_WARN("%s", _("unable to remove just-created copy target")); > + virStorageFileDeinit(mirror); > + virStorageSourceFree(mirror); Isn't this duplicitous with the same in the cleanup: label

> qemuDomainObjEndJob(driver, vm); > if (monitor_error) { > virSetError(monitor_error); > with fixups... Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt;