External/libvirt
1
0
Fork 0
Code

qemublocktest: Rename TEST_CHECKPOINT_DELETE_MERGE to TEST_CHECKPOINT_DELETE

Browse Source 
Also rename the helper struct and function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-06-01 10:40:04 +02:00
parent 4c33c5568c
commit 520d139b9c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/qemublocktest.c
View File

@ -826,7 +826,7 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
static const char *checkpointDeletePrefix = "qemublocktestdata/checkpointdelete/"; static const char *checkpointDeletePrefix = "qemublocktestdata/checkpointdelete/";
struct testQemuCheckpointDeleteMergeData { struct testQemuCheckpointDeleteData {
const char *name; const char *name;
virStorageSourcePtr chain; virStorageSourcePtr chain;
const char *deletebitmap; const char *deletebitmap;
@ -835,9 +835,9 @@ struct testQemuCheckpointDeleteMergeData {
static int static int
testQemuCheckpointDeleteMerge(const void *opaque) testQemuCheckpointDelete(const void *opaque)
{ {
const struct testQemuCheckpointDeleteMergeData *data = opaque; const struct testQemuCheckpointDeleteData *data = opaque;
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
g_autofree char *expectpath = NULL; g_autofree char *expectpath = NULL;
g_autoptr(virJSONValue) actions = NULL; g_autoptr(virJSONValue) actions = NULL;
@ -1037,7 +1037,7 @@ mymain(void)
struct testJSONtoJSONData jsontojsondata; struct testJSONtoJSONData jsontojsondata;
struct testQemuImageCreateData imagecreatedata; struct testQemuImageCreateData imagecreatedata;
struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata; struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
struct testQemuCheckpointDeleteMergeData checkpointdeletedata; struct testQemuCheckpointDeleteData checkpointdeletedata;
struct testQemuBlockBitmapValidateData blockbitmapvalidatedata; struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata; struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata; struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata;
@ -1317,18 +1317,18 @@ mymain(void)
TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty"); TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, named) \ #define TEST_CHECKPOINT_DELETE(testname, delbmp, named) \
do { \ do { \
checkpointdeletedata.name = testname; \ checkpointdeletedata.name = testname; \
checkpointdeletedata.chain = bitmapSourceChain; \ checkpointdeletedata.chain = bitmapSourceChain; \
checkpointdeletedata.deletebitmap = delbmp; \ checkpointdeletedata.deletebitmap = delbmp; \
checkpointdeletedata.nodedatafile = named; \ checkpointdeletedata.nodedatafile = named; \
if (virTestRun("checkpoint delete " testname, \ if (virTestRun("checkpoint delete " testname, \
testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \ testQemuCheckpointDelete, &checkpointdeletedata) < 0) \
ret = -1; \ ret = -1; \
} while (0) } while (0)
TEST_CHECKPOINT_DELETE_MERGE("empty", "a", "empty"); TEST_CHECKPOINT_DELETE("empty", "a", "empty");
#define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \ #define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
do { \ do { \