From 17e9d38c5b101ec705e80cd015d93df97e267f03 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 30 Aug 2018 13:36:33 -0700 Subject: [PATCH] test/unit: Fix Scan-build errors in scsi tests I had to make small modifications to one test in the dev_ut.c file to prevent a memory leak error. However, changing the index in this test from -1 to 0 has no effect on the coverage. Change-Id: Ia8a475aaa41118f072a5d9006bab9d9c84b4a10a Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/424126 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/unit/lib/scsi/dev.c/dev_ut.c | 3 ++- test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/unit/lib/scsi/dev.c/dev_ut.c b/test/unit/lib/scsi/dev.c/dev_ut.c index 6fa906772..c10a7f0ab 100644 --- a/test/unit/lib/scsi/dev.c/dev_ut.c +++ b/test/unit/lib/scsi/dev.c/dev_ut.c @@ -555,8 +555,9 @@ dev_add_lun_bdev_not_found(void) int rc; struct spdk_scsi_dev dev = {0}; - rc = spdk_scsi_dev_add_lun(&dev, "malloc2", -1, NULL, NULL); + rc = spdk_scsi_dev_add_lun(&dev, "malloc2", 0, NULL, NULL); + SPDK_CU_ASSERT_FATAL(dev.lun[0] == NULL); CU_ASSERT_NOT_EQUAL(rc, 0); } diff --git a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c index ef5349e9c..4deb2cec4 100644 --- a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c +++ b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c @@ -689,6 +689,8 @@ lba_range_test(void) ut_init_task(&task); task.lun = &lun; + task.lun->bdev_desc = NULL; + task.lun->io_channel = NULL; task.cdb = cdb; memset(cdb, 0, sizeof(cdb)); @@ -760,6 +762,8 @@ xfer_len_test(void) ut_init_task(&task); task.lun = &lun; + task.lun->bdev_desc = NULL; + task.lun->io_channel = NULL; task.cdb = cdb; memset(cdb, 0, sizeof(cdb)); @@ -847,6 +851,8 @@ _xfer_test(bool bdev_io_pool_full) /* Read 1 block */ ut_init_task(&task); task.lun = &lun; + task.lun->bdev_desc = NULL; + task.lun->io_channel = NULL; task.cdb = cdb; memset(cdb, 0, sizeof(cdb)); cdb[0] = 0x88; /* READ (16) */