--- nono/vm/virtio_scsi.cpp 2026/04/29 17:05:42 1.1.1.1 +++ nono/vm/virtio_scsi.cpp 2026/04/29 17:05:59 1.1.1.2 @@ -39,16 +39,17 @@ class VirtIOSCSIConfigWriter VirtIOSCSIDevice::VirtIOSCSIDevice(uint slot_) : inherited(OBJ_VIRTIO_SCSI, slot_) { - // 短縮形 - AddAlias("vscsi"); + // 割り込み名(とログ名) + strlcpy(intrname, "VIOSCSI", sizeof(intrname)); + SetName(intrname); + ClearAlias(); + AddAlias(intrname); device_id = VirtIO::DEVICE_ID_SCSI; vqueues.emplace_back(this, 0, "ControlQ", 8); vqueues.emplace_back(this, 1, "EventQ", 8); vqueues.emplace_back(this, 2, "RequestQ", 8); - // 割り込み名 - strlcpy(intrname, "VIOSCSI", sizeof(intrname)); // 完了通知メッセージ msgid = MessageID::VIRTIO_SCSI_DONE; @@ -59,7 +60,7 @@ VirtIOSCSIDevice::VirtIOSCSIDevice(uint } monitor = gMonitorManager->Regist(ID_MONITOR_VIRTIO_SCSI, this); - monitor->func = ToMonitorCallback(&VirtIOSCSIDevice::MonitorUpdate); + monitor->SetCallback(&VirtIOSCSIDevice::MonitorScreen); monitor->SetSize(MONITOR_WIDTH, 3 + vqlines); } @@ -77,7 +78,7 @@ VirtIOSCSIDevice::Create() } try { - domain.reset(new SCSIDomain(this, "virtio-scsi")); + domain.reset(new SCSIDomain(this, "VIOSCSI", "virtio-scsi")); } catch (...) { } if ((bool)domain == false) { warnx("Failed to initialize SCSIDomain at %s", __method__); @@ -122,19 +123,19 @@ VirtIOSCSIDevice::ResetHard(bool poweron } void -VirtIOSCSIDevice::MonitorUpdate(Monitor *, TextScreen& screen) +VirtIOSCSIDevice::MonitorScreen(Monitor *, TextScreen& screen) { int y = 0; screen.Clear(); - y = MonitorUpdateDev(screen, y); + y = MonitorScreenDev(screen, y); y++; for (const auto& q : vqueues) { - y = MonitorUpdateVirtQueue(screen, y, q); + y = MonitorScreenVirtQueue(screen, y, q); y++; - y = MonitorUpdateVirtQDesc(screen, y, q); + y = MonitorScreenVirtQDesc(screen, y, q); y++; } }