[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 2/2] qemu: blockjob: Print correct file name in error message



On 02/05/2014 10:44 AM, Peter Krempa wrote:
> 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
> ---
>  src/qemu/qemu_driver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ACK

> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 38a48db..8998201 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -15180,7 +15180,7 @@ qemuDomainBlockCommit(virDomainPtr dom, const char *path, const char *base,
>      if (!top_meta || !top_meta->backingStore) {
>          virReportError(VIR_ERR_INVALID_ARG,
>                         _("top '%s' in chain for '%s' has no backing file"),
> -                       top, path);
> +                       top_canon, path);
>          goto endjob;
>      }
>      if (!base && (flags & VIR_DOMAIN_BLOCK_COMMIT_SHALLOW)) {
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]