Update error handling when changing sector size fails

uweseimet · Jan 24, 2024 · b8de7fc · b8de7fc
1 parent 301d891
commit b8de7fc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/cpp/devices/optical_memory.cpp b/cpp/devices/optical_memory.cpp
@@ -88,9 +88,14 @@ void OpticalMemory::AddOptionPage(map<int, vector<byte>> &pages, bool) const
 
 void OpticalMemory::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uint8_t> buf, int length) const
 {
-    if (const string result = mode_page_util::ModeSelect(cmd, cdb, buf, length, 1 << GetSectorSizeShiftCount());
-    !result.empty()) {
-        LogWarn(result);
+    try {
+        if (const string result = mode_page_util::ModeSelect(cmd, cdb, buf, length, 1 << GetSectorSizeShiftCount());
+        !result.empty()) {
+            LogWarn(result);
+        }
+    }
+    catch (const scsi_exception &e) {
+        GetController()->Error(e.get_sense_key(), e.get_asc());
     }
 }
 

diff --git a/cpp/devices/scsi_cd.cpp b/cpp/devices/scsi_cd.cpp
@@ -150,9 +150,14 @@ vector<uint8_t> ScsiCd::InquiryInternal() const
 
 void ScsiCd::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uint8_t> buf, int length) const
 {
-    if (const string result = mode_page_util::ModeSelect(cmd, cdb, buf, length, 1 << GetSectorSizeShiftCount());
-    !result.empty()) {
-        LogWarn(result);
+    try {
+        if (const string result = mode_page_util::ModeSelect(cmd, cdb, buf, length, 1 << GetSectorSizeShiftCount());
+        !result.empty()) {
+            LogWarn(result);
+        }
+    }
+    catch (const scsi_exception &e) {
+        GetController()->Error(e.get_sense_key(), e.get_asc());
     }
 }
 

diff --git a/cpp/devices/scsi_hd.cpp b/cpp/devices/scsi_hd.cpp
@@ -85,9 +85,14 @@ vector<uint8_t> ScsiHd::InquiryInternal() const
 
 void ScsiHd::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uint8_t> buf, int length) const
 {
-    if (const string result = mode_page_util::ModeSelect(cmd, cdb, buf, length, 1 << GetSectorSizeShiftCount());
-    !result.empty()) {
-        LogWarn(result);
+    try {
+        if (const string result = mode_page_util::ModeSelect(cmd, cdb, buf, length, 1 << GetSectorSizeShiftCount());
+        !result.empty()) {
+            LogWarn(result);
+        }
+    }
+    catch (const scsi_exception &e) {
+        GetController()->Error(e.get_sense_key(), e.get_asc());
     }
 }