[libvirt] [PATCH] blockcommit: fix regression with explicit top argument
Commit f586965 accidentally changed the semantics of the virDomainBlockCommit command; where it previously looked for an explicit top argument from the top of the chain, it now starts from the backing file of the top. Of course, until we allow active commits, the only difference it makes is in the quality of the error message, but with code for active commit coming soon, we need to support an explicit mention of the active layer. * src/qemu/qemu_driver.c (qemuDomainBlockCommit): Start looking from top of chain. Signed-off-by: Eric Blake <eblake@redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec72d9d..bf55f67 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15528,8 +15528,7 @@ qemuDomainBlockCommit(virDomainPtr dom, if (!top) topSource = disk->src; else if (virStorageFileParseChainIndex(disk->dst, top, &topIndex) < 0 || - !(topSource = virStorageFileChainLookup(disk->src, - disk->src->backingStore, + !(topSource = virStorageFileChainLookup(disk->src, NULL, top, topIndex, &top_parent))) goto endjob; -- 1.9.3
On 06/12/14 14:12, Eric Blake wrote:
Commit f586965 accidentally changed the semantics of the virDomainBlockCommit command; where it previously looked for an explicit top argument from the top of the chain, it now starts from the backing file of the top. Of course, until we allow active commits, the only difference it makes is in the quality of the error message, but with code for active commit coming soon, we need to support an explicit mention of the active layer.
* src/qemu/qemu_driver.c (qemuDomainBlockCommit): Start looking from top of chain.
Signed-off-by: Eric Blake <eblake@redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
ACK, Peter
On 06/12/2014 06:15 AM, Peter Krempa wrote:
On 06/12/14 14:12, Eric Blake wrote:
Commit f586965 accidentally changed the semantics of the virDomainBlockCommit command; where it previously looked for an explicit top argument from the top of the chain, it now starts from the backing file of the top. Of course, until we allow active commits, the only difference it makes is in the quality of the error message, but with code for active commit coming soon, we need to support an explicit mention of the active layer.
* src/qemu/qemu_driver.c (qemuDomainBlockCommit): Start looking from top of chain.
Signed-off-by: Eric Blake <eblake@redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
ACK,
Thanks; pushed. I'm working on a followup to fix an off-by-one, where 'blockcommit --base file --top file' didn't get rejected at libvirt, and ended up giving a worse error message from qemu compared to all the other cases we flagged. But it requires enhancing the testsuite, so it's taking me a bit longer. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Peter Krempa