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

2014-02-06 Thread Peter Krempa 
On 02/05/14 19:41, Eric Blake wrote:
 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
 

Series is now pushed. Thanks.

Peter




signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

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

2014-02-05 Thread Peter Krempa 
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(-)

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)) {
-- 
1.8.5.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

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

2014-02-05 Thread Eric Blake 
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



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list