--- nono/lib/monitor_id.cpp	2026/04/29 17:05:22	1.1.1.7
+++ nono/lib/monitor_id.cpp	2026/04/29 17:05:44	1.1.1.11
@@ -27,7 +27,9 @@ MonitorManager::info {
 	{ ID_MONITOR_CRTC,	VMCap::NONE,	{ "crtc" } },
 	{ ID_MONITOR_DMAC,	VMCap::NONE,	{ "dmac" } },
 	{ ID_MONITOR_FDC,	VMCap::NONE,	{ "fdc" } },
-	{ ID_MONITOR_HOSTCOM,	VMCap::NONE,	{ "hostcom" } },
+	{ ID_MONITOR_HOSTCOM0,	VMCap::NONE,	{ "hostcom0" } },
+	{ ID_MONITOR_HOSTCOM1,	VMCap::NONE,	{ "hostcom1" } },
+	{ ID_MONITOR_HOSTCOM2,	VMCap::NONE,	{ "hostcom2" } },
 	{ ID_MONITOR_HOSTNET0,	VMCap::NONE,	{ "hostnet0" } },
 	{ ID_MONITOR_HOSTNET1,	VMCap::NONE,	{ "hostnet1" } },
 	{ ID_MONITOR_INTERRUPT,	VMCap::NONE,	{ "interrupt" } },
@@ -56,7 +58,9 @@ MonitorManager::info {
 	{ ID_MONITOR_SCHEDULER,	VMCap::NONE,	{ "scheduler" } },
 	{ ID_MONITOR_SCSIDEVS,	VMCap::NONE,	{ "scsidevs" } },
 	{ ID_MONITOR_SIO,	VMCap::NONE,	{ "sio" } },
+	{ ID_MONITOR_SLIRP,	VMCap::NONE,	{ "slirp" } },
 	{ ID_MONITOR_SPC,	VMCap::NONE,	{ "spc" } },
+	{ ID_MONITOR_SSG,	VMCap::NONE,	{ "ssg" } },
 	{ ID_MONITOR_SYSCLK,	VMCap::NONE,	{ "sysclk" } },
 	{ ID_MONITOR_SYSPORT,	VMCap::NONE,	{ "sysport" } },
 	{ ID_MONITOR_VIRTIO_BLOCK0,	VMCap::NONE,	{ "vblk0" } },
@@ -67,8 +71,11 @@ MonitorManager::info {
 	{ ID_MONITOR_VIRTIO_BLOCK5,	VMCap::NONE,	{ "vblk5" } },
 	{ ID_MONITOR_VIRTIO_BLOCK6,	VMCap::NONE,	{ "vblk6" } },
 	{ ID_MONITOR_VIRTIO_BLOCK7,	VMCap::NONE,	{ "vblk7" } },
+	{ ID_MONITOR_VIRTIO_ENTROPY,	VMCap::NONE,	{ "virtio_entropy" } },
 	{ ID_MONITOR_VIRTIO_NET,	VMCap::NONE,	{ "vnet" } },
+	{ ID_MONITOR_VIRTIO_SCSI,	VMCap::NONE,	{ "vscsi" } },
 	{ ID_MONITOR_WXHOSTINFO,	VMCap::NONE,	{ "wxhostinfo" } },
+	{ ID_MONITOR_XPASCI,	VMCap::LUNA,	{ "xpasci" } },
 	{ ID_MONITOR_XPMEMDUMP0,	VMCap::NONE,	{ "xpmemdump0" } },
 	{ ID_MONITOR_XPMEMDUMP1,	VMCap::NONE,	{ "xpmemdump1" } },
 	{ ID_MONITOR_XPMEMDUMP2,	VMCap::NONE,	{ "xpmemdump2" } },
@@ -95,7 +102,7 @@ MonitorManager::info {
 	{ ID_SUBWIN_NEWSIO,	VMCap::NEWS,	{ "newsio" } },
 	{ ID_SUBWIN_PALETTE,	VMCap::LUNA,	{ "palette" } },
 	{ ID_SUBWIN_ROM,	VMCap::LUNA|VMCap::X68030,	{ "rom" } },
-	{ ID_SUBWIN_SOFTKEY,	VMCap::ALL,	{ "softkey" } },
+	{ ID_SUBWIN_SOFTKEY,	VMCap::LUNA|VMCap::X68030,	{ "softkey" } },
 	{ ID_SUBWIN_TEXTPAL,	VMCap::X68030,	{ "textpalette", "palette" } },
 	{ ID_SUBWIN_TVRAM,	VMCap::X68030,	{ "tvram" } },
 	{ ID_SUBWIN_VECTOR,	VMCap::ALL,	{ "vector" } },
@@ -104,7 +111,7 @@ MonitorManager::info {
 	{ ID_SUBWIN_XPEXHIST,	VMCap::LUNA,	{ "xpexhist" } },
 };
 
-/*static*/ const std::vector<std::pair<int, const char *>>
+/*static*/ const std::vector<std::pair<uint, const char *>>
 Monitor::idtext {
 	{ ID_MONITOR_ACCSTAT, "ID_MONITOR_ACCSTAT" },
 	{ ID_MONITOR_AREASET, "ID_MONITOR_AREASET" },
@@ -140,7 +147,9 @@ Monitor::idtext {
 	{ ID_MONITOR_DMAC, "ID_MONITOR_DMAC" },
 	{ ID_SUBWIN_EXHIST, "ID_SUBWIN_EXHIST" },
 	{ ID_MONITOR_FDC, "ID_MONITOR_FDC" },
-	{ ID_MONITOR_HOSTCOM, "ID_MONITOR_HOSTCOM" },
+	{ ID_MONITOR_HOSTCOM0, "ID_MONITOR_HOSTCOM0" },
+	{ ID_MONITOR_HOSTCOM1, "ID_MONITOR_HOSTCOM1" },
+	{ ID_MONITOR_HOSTCOM2, "ID_MONITOR_HOSTCOM2" },
 	{ ID_MONITOR_HOSTNET0, "ID_MONITOR_HOSTNET0" },
 	{ ID_MONITOR_HOSTNET1, "ID_MONITOR_HOSTNET1" },
 	{ ID_MONITOR_INTERRUPT, "ID_MONITOR_INTERRUPT" },
@@ -176,8 +185,10 @@ Monitor::idtext {
 	{ ID_MONITOR_SCHEDULER, "ID_MONITOR_SCHEDULER" },
 	{ ID_MONITOR_SCSIDEVS, "ID_MONITOR_SCSIDEVS" },
 	{ ID_MONITOR_SIO, "ID_MONITOR_SIO" },
+	{ ID_MONITOR_SLIRP, "ID_MONITOR_SLIRP" },
 	{ ID_SUBWIN_SOFTKEY, "ID_SUBWIN_SOFTKEY" },
 	{ ID_MONITOR_SPC, "ID_MONITOR_SPC" },
+	{ ID_MONITOR_SSG, "ID_MONITOR_SSG" },
 	{ ID_MONITOR_SYSCLK, "ID_MONITOR_SYSCLK" },
 	{ ID_MONITOR_SYSPORT, "ID_MONITOR_SYSPORT" },
 	{ ID_SUBWIN_TEXTPAL, "ID_SUBWIN_TEXTPAL" },
@@ -191,9 +202,12 @@ Monitor::idtext {
 	{ ID_MONITOR_VIRTIO_BLOCK5, "ID_MONITOR_VIRTIO_BLOCK5" },
 	{ ID_MONITOR_VIRTIO_BLOCK6, "ID_MONITOR_VIRTIO_BLOCK6" },
 	{ ID_MONITOR_VIRTIO_BLOCK7, "ID_MONITOR_VIRTIO_BLOCK7" },
+	{ ID_MONITOR_VIRTIO_ENTROPY, "ID_MONITOR_VIRTIO_ENTROPY" },
 	{ ID_MONITOR_VIRTIO_NET, "ID_MONITOR_VIRTIO_NET" },
+	{ ID_MONITOR_VIRTIO_SCSI, "ID_MONITOR_VIRTIO_SCSI" },
 	{ ID_MONITOR_WXHOSTINFO, "ID_MONITOR_WXHOSTINFO" },
 	{ ID_SUBWIN_X68KIO, "ID_SUBWIN_X68KIO" },
+	{ ID_MONITOR_XPASCI, "ID_MONITOR_XPASCI" },
 	{ ID_MONITOR_XPMEMDUMP0, "ID_MONITOR_XPMEMDUMP0" },
 	{ ID_MONITOR_XPMEMDUMP1, "ID_MONITOR_XPMEMDUMP1" },
 	{ ID_MONITOR_XPMEMDUMP2, "ID_MONITOR_XPMEMDUMP2" },