|
 |
26ba25 |
From 1b01d1f1273a9307c46fb7c72a407b8ab0a16f77 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Date: Tue, 25 Sep 2018 22:34:25 +0100
|
|
|
26ba25 |
Subject: [PATCH 22/28] tests/test-blockjob-txn: move .exit to .clean
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Message-id: <20180925223431.24791-20-jsnow@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 82282
|
|
|
26ba25 |
O-Subject: [RHEL8/rhel qemu-kvm PATCH 19/25] tests/test-blockjob-txn: move .exit to .clean
|
|
|
26ba25 |
Bugzilla: 1632939
|
|
|
26ba25 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
The exit callback in this test actually only performs cleanup.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
Message-id: 20180906130225.5118-11-jsnow@redhat.com
|
|
|
26ba25 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit e4dad4275d51b594c8abbe726a4927f6f388e427)
|
|
|
26ba25 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
tests/test-blockjob-txn.c | 4 ++--
|
|
|
26ba25 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
|
|
|
26ba25 |
index ef29f35..86606f9 100644
|
|
|
26ba25 |
--- a/tests/test-blockjob-txn.c
|
|
|
26ba25 |
+++ b/tests/test-blockjob-txn.c
|
|
|
26ba25 |
@@ -24,7 +24,7 @@ typedef struct {
|
|
|
26ba25 |
int *result;
|
|
|
26ba25 |
} TestBlockJob;
|
|
|
26ba25 |
|
|
|
26ba25 |
-static void test_block_job_exit(Job *job)
|
|
|
26ba25 |
+static void test_block_job_clean(Job *job)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
BlockJob *bjob = container_of(job, BlockJob, job);
|
|
|
26ba25 |
BlockDriverState *bs = blk_bs(bjob->blk);
|
|
|
26ba25 |
@@ -73,7 +73,7 @@ static const BlockJobDriver test_block_job_driver = {
|
|
|
26ba25 |
.user_resume = block_job_user_resume,
|
|
|
26ba25 |
.drain = block_job_drain,
|
|
|
26ba25 |
.run = test_block_job_run,
|
|
|
26ba25 |
- .exit = test_block_job_exit,
|
|
|
26ba25 |
+ .clean = test_block_job_clean,
|
|
|
26ba25 |
},
|
|
|
26ba25 |
};
|
|
|
26ba25 |
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|