warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-tool/BlockEraseReserved: override driver queue_pdu() callback

Browse Source 
In preparation for removing the test-tool iscsi_queue_pdu() dlsym
overload hack, convert this test to use the regular transport driver
callback for this purpose.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2019-09-16 14:46:28 +02:00
parent fdc45fadfa
commit b705f9e524
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/test_sanitize_block_erase_reserved.c
+11 -6
View File
@@ -25,8 +25,9 @@
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
static int change_num; static int change_num;
static struct iscsi_transport iscsi_drv_orig;
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu) static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
{ {
switch (change_num) { switch (change_num) {
case 1: case 1:
@@ -43,12 +44,12 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu
break; break;
} }
change_num = 0; change_num = 0;
return 0; return iscsi_drv_orig.queue_pdu(iscsi, pdu);
} }
void test_sanitize_block_erase_reserved(void) void test_sanitize_block_erase_reserved(void)
{ {
int i; int i;
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
@@ -64,8 +65,9 @@ void test_sanitize_block_erase_reserved(void)
return; return;
} }
local_iscsi_queue_pdu = my_iscsi_queue_pdu; /* override transport queue_pdu callback for PDU manipulation */
iscsi_drv_orig = *sd->iscsi_ctx->drv;
sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu;
logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " logging(LOG_VERBOSE, "Send SANITIZE command with the reserved "
"bit in byte 1 set to 1"); "bit in byte 1 set to 1");
@@ -81,4 +83,7 @@ void test_sanitize_block_erase_reserved(void)
SANITIZE(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL, SANITIZE(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
} }
/* restore transport callbacks */
*(sd->iscsi_ctx->drv) = iscsi_drv_orig;
} }