--- nono/vm/scsicmd.h	2026/04/29 17:05:10	1.1.1.3
+++ nono/vm/scsicmd.h	2026/04/29 17:05:25	1.1.1.6
@@ -16,8 +16,6 @@
 // READ/WRITE は多すぎるのでログを省略したい場合に定義。
 //#define NO_READWRITE_LOG
 
-class SCSITarget;
-
 //
 // SCSI コマンドの基本クラス
 // (黙って成功するコマンドとしても使用可能)
@@ -111,7 +109,7 @@ class SCSICmdNotSupportedCommand : publi
 	using inherited = SCSICmd;
  public:
 	SCSICmdNotSupportedCommand(SCSITarget *);
-	virtual ~SCSICmdNotSupportedCommand() override;
+	~SCSICmdNotSupportedCommand() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 };
@@ -124,7 +122,7 @@ class SCSICmdRequestSense : public SCSIC
 	using inherited = SCSICmd;
  public:
 	SCSICmdRequestSense(SCSITarget *);
-	virtual ~SCSICmdRequestSense() override;
+	~SCSICmdRequestSense() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 };
@@ -138,7 +136,7 @@ class SCSICmdRead : public SCSICmd
 	using inherited = SCSICmd;
  public:
 	SCSICmdRead(SCSIDisk *);
-	virtual ~SCSICmdRead() override;
+	~SCSICmdRead() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 
@@ -155,7 +153,7 @@ class SCSICmdWrite : public SCSICmd
 	using inherited = SCSICmd;
  public:
 	SCSICmdWrite(SCSIDisk *);
-	virtual ~SCSICmdWrite() override;
+	~SCSICmdWrite() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 	SCSI::XferPhase DoneDataOut() override;
@@ -175,7 +173,7 @@ class SCSICmdInquiry : public SCSICmd
 	using inherited = SCSICmd;
  public:
 	SCSICmdInquiry(SCSITarget *);
-	virtual ~SCSICmdInquiry() override;
+	~SCSICmdInquiry() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 };
@@ -189,7 +187,7 @@ class SCSICmdModeSelect : public SCSICmd
 	using inherited = SCSICmd;
  public:
 	SCSICmdModeSelect(SCSITarget *);
-	virtual ~SCSICmdModeSelect() override;
+	~SCSICmdModeSelect() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 	SCSI::XferPhase DoneDataOut() override;
@@ -207,7 +205,7 @@ class SCSICmdModeSense : public SCSICmd
 	using inherited = SCSICmd;
  public:
 	SCSICmdModeSense(SCSITarget *);
-	virtual ~SCSICmdModeSense() override;
+	~SCSICmdModeSense() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 
@@ -221,7 +219,7 @@ class SCSICmdModeSense : public SCSICmd
 	};
 	// ページ処理関数の戻り値 (この値は大小比較する)
 	enum ModePageResult {
-		NotImplemented	= -1,	// 未実装や知らないページ
+		NotSupported	= -1,	// 未実装や知らないページ
 		Failed			= 0,	// 対応しない/出来ないと分かっているページ
 		Success			= 1,	// 成功
 	};
@@ -251,7 +249,7 @@ class SCSICmdStartStopUnit : public SCSI
 	using inherited = SCSICmd;
  public:
 	SCSICmdStartStopUnit(SCSIDisk *);
-	virtual ~SCSICmdStartStopUnit() override;
+	~SCSICmdStartStopUnit() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 
@@ -267,7 +265,7 @@ class SCSICmdPreventAllowMediumRemoval :
 	using inherited = SCSICmd;
  public:
 	SCSICmdPreventAllowMediumRemoval(SCSIDisk *);
-	virtual ~SCSICmdPreventAllowMediumRemoval() override;
+	~SCSICmdPreventAllowMediumRemoval() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 
@@ -285,7 +283,7 @@ class SCSICmdReadCapacity : public SCSIC
 	using inherited = SCSICmd;
  public:
 	SCSICmdReadCapacity(SCSIDisk *);
-	virtual ~SCSICmdReadCapacity() override;
+	~SCSICmdReadCapacity() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;
 
@@ -301,7 +299,7 @@ class SCSICmdReadTOC : public SCSICmd
 	using inherited = SCSICmd;
  public:
 	SCSICmdReadTOC(SCSIDisk *);
-	virtual ~SCSICmdReadTOC() override;
+	~SCSICmdReadTOC() override;
 
 	SCSI::XferPhase Command(std::vector<uint8>& cmdseq) override;