Commit 75574cb8 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

ut/vhost_scsi: fix build 



This new vhost_scsi_ut code was merged after changes to the vhost
timed_event functions and didn't get rebased correctly.

Change-Id: Ia92936a19a668a0f1113518097b20b818f39986c
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/377246


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent b6653164

test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c

+1 −4
Original line number Diff line number Diff line
@@ -107,10 +107,7 @@ DEFINE_STUB_P(spdk_conf_section_get_name, const char, (const struct spdk_conf_se 
DEFINE_STUB(spdk_env_get_socket_id, uint32_t, (uint32_t core), 0);

DEFINE_STUB_V(spdk_vhost_timed_event_send, (int32_t lcore, spdk_vhost_timed_event_fn cb_fn,

		void *arg, unsigned timeout_sec, const char *errmsg));

DEFINE_STUB_V(spdk_vhost_timed_event_init, (struct spdk_vhost_timed_event *ev, int32_t lcore,

		spdk_vhost_timed_event_fn cb_fn, void *arg, unsigned timeout_sec));

DEFINE_STUB_V(spdk_poller_unregister, (struct spdk_poller **ppoller, struct spdk_event *complete));

DEFINE_STUB_V(spdk_vhost_timed_event_wait, (struct spdk_vhost_timed_event *ev, const char *errmsg));

DEFINE_STUB(spdk_json_write_name, int, (struct spdk_json_write_ctx *w, const char *name), 0);

DEFINE_STUB(spdk_json_write_object_begin, int, (struct spdk_json_write_ctx *w), 0);

DEFINE_STUB(spdk_json_write_uint32, int, (struct spdk_json_write_ctx *w, uint32_t val), 0);
@@ -255,7 +252,7 @@ vhost_scsi_dev_remove_test(void) 
	/* Failed to remove device */

	MOCK_SET(spdk_vhost_dev_remove_fail, bool, true);

	rc = spdk_vhost_scsi_dev_remove(&svdev->vdev);

	CU_ASSERT(rc == -EIO);

	CU_ASSERT(rc == -1);



	free(svdev);

}