I think it makes sense to collect *all* block HMP stuff here. Left in monitor/hmp-cmds.c: hmp_eject(), hmp_nbd_server_start(), ...
I guess hmp_change() has to stay there, because it's both block and ui. Left in blockdev.c: hmp_drive_add_node(). Quick grep for possible files to check: $ git-grep -l 'monitor[a-z_-]*.h' | xargs grep -l 'block[a-z_-]*\.h' MAINTAINERS blockdev-hmp-cmds.c blockdev.c cpus.c dump/dump.c hw/display/qxl.c hw/scsi/vhost-scsi.c hw/usb/dev-storage.c include/monitor/monitor.h migration/migration.c monitor/hmp-cmds.c monitor/hmp.c monitor/misc.c monitor/qmp-cmds.c qdev-monitor.c vl.c
