libtcmu: move tcmu_get_runner_handler into scsi.c

There needs one place to store codes to be sharable between
tcmu-runner and other daemons like consume and tcmu-synthesizer
but not libtcmu users out of tree. Maybe tcmu_get_runner_handler
is not much about SCSI, it's still reasonable to place it there
for simplicity.

Signed-off-by: Yaowei Bai <[email protected]>

Author: Yaowei Bai

libtcmu.c

@@ -27,10 +27,7 @@
 #include "libtcmu.h"
 #include "libtcmu_log.h"
 #include "libtcmu_priv.h"
-#include "tcmur_aio.h"
-#include "tcmur_cmd_handler.h"
-#include "tcmu-runner.h"
-#include "tcmur_device.h"
+#include "scsi_defs.h"
 
 #define TCMU_NL_VERSION 2
 
@@ -948,13 +945,6 @@ struct tcmulib_handler *tcmu_get_dev_handler(struct tcmu_device *dev)
 	return dev->handler;
 }
 
-struct tcmur_handler *tcmu_get_runner_handler(struct tcmu_device *dev)
-{
-	struct tcmulib_handler *handler = tcmu_get_dev_handler(dev);
-
-	return handler->hm_private;
-}
-
 static inline struct tcmu_cmd_entry *
 device_cmd_head(struct tcmu_device *dev)
 {

libtcmu_common.h

@@ -141,7 +141,6 @@ bool tcmu_get_dev_write_cache_enabled(struct tcmu_device *dev);
 void tcmu_set_dev_solid_state_media(struct tcmu_device *dev, bool solid_state);
 bool tcmu_get_dev_solid_state_media(struct tcmu_device *dev);
 struct tcmulib_handler *tcmu_get_dev_handler(struct tcmu_device *dev);
-struct tcmur_handler *tcmu_get_runner_handler(struct tcmu_device *dev);
 void tcmu_block_device(struct tcmu_device *dev);
 void tcmu_unblock_device(struct tcmu_device *dev);
 void tcmu_flush_device(struct tcmu_device *dev);

scsi.c

@@ -82,6 +82,13 @@ bool char_to_hex(unsigned char *val, char c)
 	return false;
 }
 
+struct tcmur_handler *tcmu_get_runner_handler(struct tcmu_device *dev)
+{
+        struct tcmulib_handler *handler = tcmu_get_dev_handler(dev);
+
+        return handler->hm_private;
+}
+
 int tcmu_emulate_evpd_inquiry(
 	struct tcmu_device *dev,
 	struct tgt_port *port,

scsi.h

@@ -30,6 +30,7 @@ extern "C" {
 
 /* Basic implementations of mandatory SCSI commands */
 bool char_to_hex(unsigned char *val, char c);
+struct tcmur_handler *tcmu_get_runner_handler(struct tcmu_device *dev);
 int tcmu_emulate_inquiry(struct tcmu_device *dev, struct tgt_port *port, uint8_t *cdb, struct iovec *iovec, size_t iov_cnt);
 int tcmu_emulate_start_stop(struct tcmu_device *dev, uint8_t *cdb);
 int tcmu_emulate_test_unit_ready(uint8_t *cdb, struct iovec *iovec, size_t iov_cnt);

tcmur_cmd_handler.c

@@ -23,8 +23,8 @@
 #include "libtcmu_common.h"
 #include "tcmur_aio.h"
 #include "tcmur_device.h"
-#include "tcmur_cmd_handler.h"
 #include "tcmu-runner.h"
+#include "tcmur_cmd_handler.h"
 #include "alua.h"
 
 static void _cleanup_spin_lock(void *arg)