|
 |
b971b8 |
From a97672d9aa9be91ddb2fee0e592e0e137ecca20f Mon Sep 17 00:00:00 2001
|
|
|
b971b8 |
Message-Id: <a97672d9aa9be91ddb2fee0e592e0e137ecca20f@dist-git>
|
|
|
b971b8 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
b971b8 |
Date: Tue, 23 Jun 2020 12:23:54 +0200
|
|
|
b971b8 |
Subject: [PATCH] qemublocktest: Rename TEST_CHECKPOINT_DELETE_MERGE to
|
|
|
b971b8 |
TEST_CHECKPOINT_DELETE
|
|
|
b971b8 |
MIME-Version: 1.0
|
|
|
b971b8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b971b8 |
Content-Transfer-Encoding: 8bit
|
|
|
b971b8 |
|
|
|
b971b8 |
Also rename the helper struct and function.
|
|
|
b971b8 |
|
|
|
b971b8 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
b971b8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
b971b8 |
(cherry picked from commit 520d139b9c3bbf6cc6453044fa6304e1429b7f11)
|
|
|
b971b8 |
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
|
|
|
b971b8 |
Message-Id: <cd907a614df510e759d085739ff0523a1ae7b7cc.1592906423.git.pkrempa@redhat.com>
|
|
|
b971b8 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
b971b8 |
---
|
|
|
b971b8 |
tests/qemublocktest.c | 14 +++++++-------
|
|
|
b971b8 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
b971b8 |
|
|
|
b971b8 |
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
|
|
|
b971b8 |
index 201e5df6b4..0ec964c2c6 100644
|
|
|
b971b8 |
--- a/tests/qemublocktest.c
|
|
|
b971b8 |
+++ b/tests/qemublocktest.c
|
|
|
b971b8 |
@@ -826,7 +826,7 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
|
|
|
b971b8 |
|
|
|
b971b8 |
static const char *checkpointDeletePrefix = "qemublocktestdata/checkpointdelete/";
|
|
|
b971b8 |
|
|
|
b971b8 |
-struct testQemuCheckpointDeleteMergeData {
|
|
|
b971b8 |
+struct testQemuCheckpointDeleteData {
|
|
|
b971b8 |
const char *name;
|
|
|
b971b8 |
virStorageSourcePtr chain;
|
|
|
b971b8 |
const char *deletebitmap;
|
|
|
b971b8 |
@@ -835,9 +835,9 @@ struct testQemuCheckpointDeleteMergeData {
|
|
|
b971b8 |
|
|
|
b971b8 |
|
|
|
b971b8 |
static int
|
|
|
b971b8 |
-testQemuCheckpointDeleteMerge(const void *opaque)
|
|
|
b971b8 |
+testQemuCheckpointDelete(const void *opaque)
|
|
|
b971b8 |
{
|
|
|
b971b8 |
- const struct testQemuCheckpointDeleteMergeData *data = opaque;
|
|
|
b971b8 |
+ const struct testQemuCheckpointDeleteData *data = opaque;
|
|
|
b971b8 |
g_autofree char *actual = NULL;
|
|
|
b971b8 |
g_autofree char *expectpath = NULL;
|
|
|
b971b8 |
g_autoptr(virJSONValue) actions = NULL;
|
|
|
b971b8 |
@@ -1037,7 +1037,7 @@ mymain(void)
|
|
|
b971b8 |
struct testJSONtoJSONData jsontojsondata;
|
|
|
b971b8 |
struct testQemuImageCreateData imagecreatedata;
|
|
|
b971b8 |
struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
|
|
|
b971b8 |
- struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
|
|
|
b971b8 |
+ struct testQemuCheckpointDeleteData checkpointdeletedata;
|
|
|
b971b8 |
struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
|
|
|
b971b8 |
struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
|
|
|
b971b8 |
struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata;
|
|
|
b971b8 |
@@ -1316,18 +1316,18 @@ mymain(void)
|
|
|
b971b8 |
|
|
|
b971b8 |
TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
|
|
|
b971b8 |
|
|
|
b971b8 |
-#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, named) \
|
|
|
b971b8 |
+#define TEST_CHECKPOINT_DELETE(testname, delbmp, named) \
|
|
|
b971b8 |
do { \
|
|
|
b971b8 |
checkpointdeletedata.name = testname; \
|
|
|
b971b8 |
checkpointdeletedata.chain = bitmapSourceChain; \
|
|
|
b971b8 |
checkpointdeletedata.deletebitmap = delbmp; \
|
|
|
b971b8 |
checkpointdeletedata.nodedatafile = named; \
|
|
|
b971b8 |
if (virTestRun("checkpoint delete " testname, \
|
|
|
b971b8 |
- testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \
|
|
|
b971b8 |
+ testQemuCheckpointDelete, &checkpointdeletedata) < 0) \
|
|
|
b971b8 |
ret = -1; \
|
|
|
b971b8 |
} while (0)
|
|
|
b971b8 |
|
|
|
b971b8 |
- TEST_CHECKPOINT_DELETE_MERGE("empty", "a", "empty");
|
|
|
b971b8 |
+ TEST_CHECKPOINT_DELETE("empty", "a", "empty");
|
|
|
b971b8 |
|
|
|
b971b8 |
#define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
|
|
|
b971b8 |
do { \
|
|
|
b971b8 |
--
|
|
|
b971b8 |
2.27.0
|
|
|
b971b8 |
|