Log SG device

uweseimet · Jan 31, 2025 · d2765a0 · d2765a0
1 parent 2713338
commit d2765a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cpp/shared/sg_adapter.cpp b/cpp/shared/sg_adapter.cpp
@@ -2,7 +2,7 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2024 Uwe Seimet
+// Copyright (C) 2024-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
@@ -18,17 +18,19 @@
 using namespace memory_util;
 using namespace sg_util;
 
-string SgAdapter::Init(const string &device)
+string SgAdapter::Init(const string &d)
 {
     try {
-        fd = OpenDevice(device);
+        fd = OpenDevice(d);
     }
     catch (const IoException &e) {
         return e.what();
     }
 
     GetBlockSize();
 
+    device = d;
+
     return "";
 }
 
@@ -107,7 +109,7 @@ SgAdapter::SgResult SgAdapter::SendCommandInternal(span<uint8_t> cdb, span<uint8
     io_hdr.timeout = timeout * 1000;
 
     if (enable_log && sg_logger.level() <= level::debug) {
-        sg_logger.debug(command_meta_data.LogCdb(cdb, "SG driver"));
+        sg_logger.debug(command_meta_data.LogCdb(cdb, fmt::format("SG driver ({})", device)));
     }
 
     const int status = ioctl(fd, SG_IO, &io_hdr) < 0 ? -1 : io_hdr.status;

diff --git a/cpp/shared/sg_adapter.h b/cpp/shared/sg_adapter.h
@@ -45,6 +45,8 @@ class SgAdapter
 
     void GetBlockSize();
 
+    string device;
+
     logger &sg_logger;
 
     CommandMetaData &command_meta_data = CommandMetaData::GetInstance();