Update EOM handling when hitting end-of-data while spacing for filemark

uweseimet · Dec 9, 2024 · 61c931d · 61c931d
1 parent 87cb802
commit 61c931d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cpp/devices/tape.cpp b/cpp/devices/tape.cpp
@@ -688,9 +688,11 @@ SimhMetaData Tape::FindNextObject(object_type type, int32_t requested_count, boo
 void Tape::RaiseBeginningOfPartition(int64_t info)
 {
     LogTrace("Encountered beginning-of-partition while reverse-spacing");
+
     ResetPositions();
     SetInformation(info);
     SetEom(ascq::beginning_of_partition_medium_detected);
+
     throw scsi_exception(sense_key::no_sense);
 }
 
@@ -712,7 +714,6 @@ void Tape::RaiseEndOfData(object_type type, int64_t info)
         static_cast<int>(type)));
 
     SetInformation(info);
-    SetEom(ascq::end_of_data_detected);
 
     throw scsi_exception(sense_key::blank_check, asc::no_additional_sense_information);
 }

diff --git a/cpp/test/tape_test.cpp b/cpp/test/tape_test.cpp
@@ -632,7 +632,7 @@ TEST(TapeTest, Space6_simh)
     controller->SetCdbByte(4, 1);
     Dispatch(tape, scsi_command::space_6, sense_key::blank_check);
     RequestSense(controller, tape);
-    EXPECT_EQ(ascq::end_of_data_detected, static_cast<ascq>(controller->GetBuffer()[13]));
+    EXPECT_NE(ascq::end_of_data_detected, static_cast<ascq>(controller->GetBuffer()[13]));
     EXPECT_TRUE(controller->GetBuffer()[0] & 0x80);
     EXPECT_EQ(1U, GetInt32(controller->GetBuffer(), 3));
     CheckPositions(tape, 1044, 3);