From 88d4bc5653fe4e18f57060eca5b9d551af55a9ed Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 20 Apr 2019 15:52:09 +0000 Subject: [PATCH 1/3] qla2x00t-32gbit, target: Update README file git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8255 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla2x00-target/README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qla2x00t-32gbit/qla2x00-target/README b/qla2x00t-32gbit/qla2x00-target/README index 6c05debfc..fb1b717e8 100644 --- a/qla2x00t-32gbit/qla2x00-target/README +++ b/qla2x00t-32gbit/qla2x00-target/README @@ -14,6 +14,11 @@ the previous version of the SCST QLogic target driver are: { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2061) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2081) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2281) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2089) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2289) }, - Works in combination with Linux kernel v2.6.32 and later. Known Bugs From 3002ba76524f27b5f7dfdaf483b5673d83fcc7c1 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 20 Apr 2019 15:53:06 +0000 Subject: [PATCH 2/3] usr/stpgd: Fix the perf build Reported-by: Rob Turk git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8256 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- usr/stpgd/stpgd_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/stpgd/stpgd_main.c b/usr/stpgd/stpgd_main.c index a2d8bcc35..584df5bab 100644 --- a/usr/stpgd/stpgd_main.c +++ b/usr/stpgd/stpgd_main.c @@ -46,12 +46,12 @@ char *app_name; # endif #endif /* DEBUG */ -bool log_daemon = true; unsigned long trace_flag = DEFAULT_LOG_FLAGS; #endif /* defined(DEBUG) || defined(TRACING) */ #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +bool log_daemon = true; int transition_timeout = DEFAULT_TRANSITION_TIME; static struct option const long_options[] = { @@ -519,8 +519,10 @@ int main(int argc, char **argv) PRINT_INFO("trace_flag %lx", trace_flag); #endif if (log_daemon) { +#if defined(DEBUG) || defined(TRACING) trace_flag &= ~TRACE_TIME; trace_flag &= ~TRACE_PID; +#endif pid = fork(); if (pid < 0) { From 07e936a25662035702af551bdcd28c78497920b9 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 20 Apr 2019 15:53:53 +0000 Subject: [PATCH 3/3] usr/fileio/common.c: Suppress a compiler warning Avoid that gcc 8 complains about the strncpy() call. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8257 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- usr/fileio/common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/fileio/common.c b/usr/fileio/common.c index def2c36ae..46f8428a7 100644 --- a/usr/fileio/common.c +++ b/usr/fileio/common.c @@ -996,9 +996,11 @@ static void exec_inquiry(struct vdisk_cmd *vcmd) resp_len = buf[3] + 6; } else if (0x80 == cmd->cdb[2]) { /* unit serial number */ int usn_len = strlen(dev->usn); + buf[1] = 0x80; buf[3] = usn_len; - strncpy((char *)&buf[4], dev->usn, usn_len); + assert(4 + usn_len <= sizeof(buf)); + memcpy(&buf[4], dev->usn, usn_len); resp_len = buf[3] + 4; } else if (0x83 == cmd->cdb[2]) { /* device identification */ int num = 4;