2 files changed, 9 insertions, 3 deletions

diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 507910992c59..b128c20770bc 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -35,6 +35,7 @@ struct se_subsystem_api {
         u32 (*get_device_type)(struct se_device *);
         sector_t (*get_blocks)(struct se_device *);
         unsigned char *(*get_sense_buffer)(struct se_cmd *);
+        bool (*get_write_cache)(struct se_device *);
 };
 
 struct sbc_ops {
@@ -52,11 +53,13 @@ void	target_complete_cmd(struct se_cmd *, u8);
 
 sense_reason_t  spc_parse_cdb(struct se_cmd *cmd, unsigned int *size);
 sense_reason_t  spc_emulate_report_luns(struct se_cmd *cmd);
-sector_t        spc_get_write_same_sectors(struct se_cmd *cmd);
+sense_reason_t  spc_emulate_inquiry_std(struct se_cmd *, unsigned char *);
+sense_reason_t  spc_emulate_evpd_83(struct se_cmd *, unsigned char *);
 
 sense_reason_t  sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops);
 u32     sbc_get_device_rev(struct se_device *dev);
 u32     sbc_get_device_type(struct se_device *dev);
+sector_t        sbc_get_write_same_sectors(struct se_cmd *cmd);
 
 void    transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);
 int     transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 663e34a5383f..c4af592f7057 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -44,7 +44,7 @@
 /* Used by core_alua_store_tg_pt_gp_info() and target_core_alua_tg_pt_gp_show_attr_members() */
 #define TG_PT_GROUP_NAME_BUF                    256
 /* Used to parse VPD into struct t10_vpd */
-#define VPD_TMP_BUF_SIZE                        128
+#define VPD_TMP_BUF_SIZE                        254
 /* Used by transport_generic_cmd_sequencer() */
 #define READ_BLOCK_LEN                          6
 #define READ_CAP_LEN                            8
@@ -75,6 +75,8 @@
 #define DA_MAX_WRITE_SAME_LEN                   0
 /* Default max transfer length */
 #define DA_FABRIC_MAX_SECTORS                   8192
+/* Use a model alias based on the configfs backend device name */
+#define DA_EMULATE_MODEL_ALIAS                  0
 /* Emulation for Direct Page Out */
 #define DA_EMULATE_DPO                          0
 /* Emulation for Forced Unit Access WRITEs */
@@ -193,6 +195,7 @@ enum tcm_sense_reason_table {
         TCM_RESERVATION_CONFLICT                = R(0x10),
         TCM_ADDRESS_OUT_OF_RANGE                = R(0x11),
         TCM_OUT_OF_RESOURCES                    = R(0x12),
+        TCM_PARAMETER_LIST_LENGTH_ERROR         = R(0x13),
 #undef R
 };
 
@@ -211,7 +214,6 @@ enum tcm_tmreq_table {
         TMR_LUN_RESET           = 5,
         TMR_TARGET_WARM_RESET   = 6,
         TMR_TARGET_COLD_RESET   = 7,
-        TMR_FABRIC_TMR          = 255,
 };
 
 /* fabric independent task management response values */
@@ -592,6 +594,7 @@ struct se_dev_entry {
 };
 
 struct se_dev_attrib {
+        int             emulate_model_alias;
         int             emulate_dpo;
         int             emulate_fua_write;
         int             emulate_fua_read;