NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rewrite bitmap handling for block commit

Browse Source 
Reuse qemuBlockGetBitmapMergeActions which allows removing the ad-hoc
implementation of bitmap merging for block commit. The new approach is
way simpler and more robust and also allows us to get rid of the
disabling of bitmaps done prior to the start as we actually do want to
update the bitmaps in the base.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa
2020-04-17 09:51:40 +02:00
parent b630cf4c0d
commit 20a7abc2d2
6 changed files with 42 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/qemublocktest.c
View File

@@ -928,12 +928,11 @@ testQemuBlockBitmapBlockcommit(const void *opaque)
g_autofree char *actual = NULL;
g_autofree char *expectpath = NULL;
g_autoptr(virJSONValue) actionsDisable = NULL;
g_autoptr(virJSONValue) actionsMerge = NULL;
g_autoptr(virJSONValue) nodedatajson = NULL;
g_autoptr(virHashTable) nodedata = NULL;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
VIR_AUTOSTRINGLIST bitmapsDisable = NULL;
bool active = data->top == data->chain;
expectpath = g_strdup_printf("%s/%s%s", abs_srcdir,
blockcommitPrefix, data->name);
@@ -947,20 +946,10 @@ testQemuBlockBitmapBlockcommit(const void *opaque)
return -1;
}
if (qemuBlockBitmapsHandleCommitStart(data->top, data->base, nodedata,
&actionsDisable, &bitmapsDisable) < 0)
return -1;
virBufferAddLit(&buf, "pre job bitmap disable:\n");
if (actionsDisable &&
virJSONValueToBuffer(actionsDisable, &buf, true) < 0)
return -1;
virBufferAddLit(&buf, "merge bitmpas:\n");
if (qemuBlockBitmapsHandleCommitFinish(data->top, data->base, nodedata,
&actionsMerge, bitmapsDisable) < 0)
if (qemuBlockBitmapsHandleCommitFinish(data->top, data->base, active, nodedata,
&actionsMerge) < 0)
return -1;
if (actionsMerge &&
@@ -1357,6 +1346,7 @@ mymain(void)
#define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
do {\
blockbitmapblockcommitdata.name = testname; \
blockbitmapblockcommitdata.chain = bitmapSourceChain; \
blockbitmapblockcommitdata.top = testQemuBitmapGetFakeChainEntry(bitmapSourceChain, topimg); \
blockbitmapblockcommitdata.base = testQemuBitmapGetFakeChainEntry(bitmapSourceChain, baseimg); \
blockbitmapblockcommitdata.nodedatafile = ndf; \

1
tests/qemublocktestdata/bitmapblockcommit/empty
View File

@@ -1,2 +1 @@
pre job bitmap disable:
merge bitmpas: