--- nono/vm/virtio_block.h 2026/04/29 17:05:29 1.1.1.2 +++ nono/vm/virtio_block.h 2026/04/29 17:06:00 1.1.1.5 @@ -12,7 +12,6 @@ #include "virtio_base.h" #include "diskimage.h" -#include "monitor.h" #include "scsidev.h" class VirtIOBlockDevice : public VirtIODevice @@ -33,7 +32,7 @@ class VirtIOBlockDevice : public VirtIOD uint32 GetAccessWrite() const { return access_write; } private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); const char *GetFeatureName(uint feature) const override; @@ -43,6 +42,7 @@ class VirtIOBlockDevice : public VirtIOD void ProcessDesc(VirtIOReq&) override; uint32 CmdRead(VirtIOReq&, uint64 sector, uint32 datalen); uint32 CmdWrite(VirtIOReq&, uint64 sector, uint32 datalen); + uint32 CmdGetID(VirtIOReq&, uint32 datalen); uint id {}; // 識別番号 std::string pathname {}; // イメージファイルのフルパス