hmp: Normalize HMP command handler names
Subsystems (2)
cover hmp: Normalize HMP command handler names
When I can't guess a handler's name, I have to look it up in hmp-commands.hx. Happens often enough to annoy me. Let's make them more predictable.
Touches several subsystems because HMP command handlers are still spread far and wide, but the changes are trivial. Speak up if you want your subsystem's part routed through your tree rather than -trivial.
Markus Armbruster (3):
hmp: Clean up declarations for long-gone info handlers
hmp: Name HMP command handler functions hmp_COMMAND()
hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
block/block-backend.c | 6 +- blockdev.c | 6 +- device-hotplug.c | 2 +- hmp-commands.hx | 86 +++++++++++++------------- hmp.c | 6 +- hmp.h | 6 +- hw/core/loader.c | 2 +- hw/intc/i8259.c | 4 +- hw/intc/lm32_pic.c | 4 +- hw/pci/pci-hotplug-old.c | 4 +- hw/pci/pci-stub.c | 2 +- hw/pci/pcie_aer.c | 2 +- hw/sparc/sun4m.c | 4 +- hw/usb/bus.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/usb/host-stub.c | 2 +- include/hw/i386/pc.h | 4 +- include/hw/lm32/lm32_pic.h | 4 +- include/hw/loader.h | 2 +- include/hw/sparc/sun4m.h | 4 +- include/hw/usb.h | 2 +- include/migration/migration.h | 4 -- include/monitor/qdev.h | 4 +- include/net/net.h | 6 +- include/net/slirp.h | 6 +- include/sysemu/block-backend.h | 2 +- include/sysemu/blockdev.h | 4 +- include/sysemu/sysemu.h | 23 +++---- include/ui/console.h | 2 +- include/ui/qemu-spice.h | 3 - monitor.c | 134 ++++++++++++++++++++--------------------- net/net.c | 6 +- net/slirp.c | 6 +- qdev-monitor.c | 4 +- savevm.c | 6 +- ui/input.c | 2 +- vl.c | 4 +- 37 files changed, 181 insertions(+), 191 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/3 hmp: Clean up declarations for long-gone info handlers
Leftovers from
d1f2964 qapi: Convert query-spice
791e7c8 qapi: Convert query-migrate
0fe6a7f slirp: Drop statistic code
--- include/migration/migration.h | 4 ---- include/sysemu/sysemu.h | 3 --- include/ui/qemu-spice.h | 3 --- 3 files changed, 10 deletions(-)
include/migration/migration.h +0 -4
@@ -71,10 +71,6 @@ void qemu_start_incoming_migration(const char *uri, Error **errp);uint64_t migrate_max_downtime (void ); -void do_info_migrate_print (Monitor *mon,const QObject *data); - -void do_info_migrate (Monitor *mon,QObject **ret_data); -void exec_start_incoming_migration (const char *host_port,Error **errp);void exec_start_outgoing_migration (MigrationState *s,const char *host_port,Error **errp);
include/sysemu/sysemu.h +0 -3
@@ -90,9 +90,6 @@ void qemu_savevm_state_cancel(void);uint64_t qemu_savevm_state_pending (QEMUFile *f,uint64_t max_size);int qemu_loadvm_state (QEMUFile *f); -/* SLIRP */ -void do_info_slirp (Monitor *mon); - typedef enum DisplayType { DT_DEFAULT,
include/ui/qemu-spice.h +0 -3
@@ -45,9 +45,6 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,const char *subject, MonitorCompletion cb, void *opaque); -void do_info_spice_print (Monitor *mon,const QObject *data); -void do_info_spice (Monitor *mon,QObject **ret_data); -CharDriverState *qemu_chr_open_spice_vmc (const char *type);#if SPICE_SERVER_VERSION >=0x000c02 CharDriverState *qemu_chr_open_spice_port (const char *name);
Signature · 1 line
1.9.3
PATCH 2/3 hmp: Name HMP command handler functions hmp_COMMAND()
In reply to Markus ArmbrusterSome are called do_COMMAND() (old ones, usually), some hmp_COMMAND(), and sometimes COMMAND pointlessly differs in spelling.
Normalize to hmp_COMMAND(), where COMMAND is exactly the command name with '-' replaced by '_'.
Exceptions:
* do_device_add() and client_migrate_info() *not* renamed to hmp_device_add(), hmp_client_migrate_info(), because they're also QMP handlers. They still need to be converted to QAPI.
* do_memory_dump(), do_physical_memory_dump(), do_ioport_read(), do_ioport_write() renamed do hmp_* instead of hmp_x(), hmp_xp(), hmp_i(), hmp_o(), because those names are too cryptic for my taste.
* do_info_help() renamed to hmp_info_help() instead of hmp_info(), because it only covers help.
--- block/block-backend.c | 6 +-- blockdev.c | 6 +-- device-hotplug.c | 2 +- hmp-commands.hx | 86 +++++++++++++++++++++--------------------- hmp.c | 6 +-- hmp.h | 6 +-- hw/pci/pci-hotplug-old.c | 4 +- hw/pci/pci-stub.c | 2 +- hw/pci/pcie_aer.c | 2 +- include/net/net.h | 4 +- include/net/slirp.h | 4 +- include/sysemu/block-backend.h | 2 +- include/sysemu/blockdev.h | 4 +- include/sysemu/sysemu.h | 16 ++++---- include/ui/console.h | 2 +- monitor.c | 50 ++++++++++++------------ net/net.c | 4 +- net/slirp.c | 4 +- savevm.c | 4 +- ui/input.c | 2 +- vl.c | 4 +- 21 files changed, 110 insertions(+), 110 deletions(-)
block/block-backend.c +3 -3
@@ -101,7 +101,7 @@ static void blk_delete(BlockBackend *blk)bdrv_unref (blk->bs); blk->bs =NULL ; } -/* Avoid double-remove after blk_hide_on_behalf_of_do_drive_del() */ +/* Avoid double-remove after blk_hide_on_behalf_of_hmp_drive_del() */ if (blk->name[0 ]) {QTAILQ_REMOVE (&blk_backends, blk, link); }
@@ -162,7 +162,7 @@ BlockBackend *blk_next(BlockBackend *blk)/* * Return @blk's name, a non-null string. * Wart: the name is empty iff @blk has been hidden with -* blk_hide_on_behalf_of_do_drive_del(). +* blk_hide_on_behalf_of_hmp_drive_del(). */ const char *blk_name (BlockBackend *blk) {
@@ -238,7 +238,7 @@ BlockBackend *blk_by_legacy_dinfo(DriveInfo *dinfo)* Strictly for use by do_drive_del(). * TODO get rid of it! */ -void blk_hide_on_behalf_of_do_drive_del (BlockBackend *blk) +void blk_hide_on_behalf_of_hmp_drive_del (BlockBackend *blk) {QTAILQ_REMOVE (&blk_backends, blk, link); blk->name[0 ] =0 ;
blockdev.c +3 -3
@@ -1025,7 +1025,7 @@ fail:return dinfo; } -void do_commit (Monitor *mon,const QDict *qdict) +void hmp_commit (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_str (qdict,"device" );BlockDriverState *bs;
@@ -1953,7 +1953,7 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,aio_context_release (aio_context); } -int do_drive_del (Monitor *mon,const QDict *qdict,QObject **ret_data) +int hmp_drive_del (Monitor *mon,const QDict *qdict,QObject **ret_data) {const char *id =qdict_get_str (qdict,"id" );BlockBackend *blk;
@@ -1995,7 +1995,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data)* then we can just get rid of the block driver state right here. */ if (blk_get_attached_dev (blk)) { -blk_hide_on_behalf_of_do_drive_del (blk); +blk_hide_on_behalf_of_hmp_drive_del (blk);/* Further I/O must not pause the guest */ bdrv_set_on_error (bs,BLOCKDEV_ON_ERROR_REPORT ,BLOCKDEV_ON_ERROR_REPORT );
device-hotplug.c +1 -1
@@ -50,7 +50,7 @@ DriveInfo *add_init_drive(const char *optstr)return dinfo; } -void drive_hot_add (Monitor *mon,const QDict *qdict) +void hmp_drive_add (Monitor *mon,const QDict *qdict) {DriveInfo *dinfo =NULL ;const char *opts =qdict_get_str (qdict,"opts" );
hmp-commands.hx +43 -43
344 lines not on this page · raw message
hmp.c +3 -3
@@ -923,7 +923,7 @@ void hmp_system_wakeup(Monitor *mon, const QDict *qdict)qmp_system_wakeup (NULL ); } -void hmp_inject_nmi (Monitor *mon,const QDict *qdict) +void hmp_nmi (Monitor *mon,const QDict *qdict) {Error *err =NULL ;
@@ -1532,7 +1532,7 @@ void hmp_closefd(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, &err); } -void hmp_send_key (Monitor *mon,const QDict *qdict) +void hmp_sendkey (Monitor *mon,const QDict *qdict) {const char *keys =qdict_get_str (qdict,"keys" );KeyValueList *keylist, *head =NULL , *tmp =NULL ;
@@ -1601,7 +1601,7 @@ err_out: goto out; } -void hmp_screen_dump (Monitor *mon,const QDict *qdict) +void hmp_screendump (Monitor *mon,const QDict *qdict) {const char *filename =qdict_get_str (qdict,"filename" );Error *err =NULL ;
hmp.h +3 -3
@@ -49,7 +49,7 @@ void hmp_ringbuf_write(Monitor *mon, const QDict *qdict);void hmp_ringbuf_read (Monitor *mon,const QDict *qdict);void hmp_cont (Monitor *mon,const QDict *qdict);void hmp_system_wakeup (Monitor *mon,const QDict *qdict); -void hmp_inject_nmi (Monitor *mon,const QDict *qdict); +void hmp_nmi (Monitor *mon,const QDict *qdict);void hmp_set_link (Monitor *mon,const QDict *qdict);void hmp_block_passwd (Monitor *mon,const QDict *qdict);void hmp_balloon (Monitor *mon,const QDict *qdict);
@@ -82,8 +82,8 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict);void hmp_netdev_del (Monitor *mon,const QDict *qdict);void hmp_getfd (Monitor *mon,const QDict *qdict);void hmp_closefd (Monitor *mon,const QDict *qdict); -void hmp_send_key (Monitor *mon,const QDict *qdict); -void hmp_screen_dump (Monitor *mon,const QDict *qdict); +void hmp_sendkey (Monitor *mon,const QDict *qdict); +void hmp_screendump (Monitor *mon,const QDict *qdict);void hmp_nbd_server_start (Monitor *mon,const QDict *qdict);void hmp_nbd_server_add (Monitor *mon,const QDict *qdict);void hmp_nbd_server_stop (Monitor *mon,const QDict *qdict);
hw/pci/pci-hotplug-old.c +2 -2
@@ -267,7 +267,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,return dev; } -void pci_device_hot_add (Monitor *mon,const QDict *qdict) +void hmp_pci_add (Monitor *mon,const QDict *qdict) {PCIDevice *dev =NULL ;const char *pci_addr =qdict_get_str (qdict,"pci_addr" );
@@ -337,7 +337,7 @@ static int pci_device_hot_remove(Monitor *mon, const char *pci_addr)return 0 ; } -void do_pci_device_hot_remove (Monitor *mon,const QDict *qdict) +void hmp_pci_del (Monitor *mon,const QDict *qdict) {pci_device_hot_remove (mon,qdict_get_str (qdict,"pci_addr" )); }
hw/pci/pci-stub.c +1 -1
@@ -34,7 +34,7 @@ static void pci_error_message(Monitor *mon)monitor_printf (mon,"PCI devices not supported\n" ); } -int do_pcie_aer_inject_error (Monitor *mon, +int hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict,QObject **ret_data) {pci_error_message (mon);
hw/pci/pcie_aer.c +1 -1
@@ -962,7 +962,7 @@ static int pcie_aer_parse_error_string(const char *error_name,return -EINVAL ; } -int do_pcie_aer_inject_error (Monitor *mon, +int hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict,QObject **ret_data) {const char *id =qdict_get_str (qdict,"id" );
include/net/net.h +2 -2
@@ -187,8 +187,8 @@ int net_client_parse(QemuOptsList *opts_list, const char *str);int net_init_clients (void );void net_check_clients (void );void net_cleanup (void ); -void net_host_device_add (Monitor *mon,const QDict *qdict); -void net_host_device_remove (Monitor *mon,const QDict *qdict); +void hmp_host_net_add (Monitor *mon,const QDict *qdict); +void hmp_host_net_remove (Monitor *mon,const QDict *qdict);void netdev_add (QemuOpts *opts,Error **errp);int qmp_netdev_add (Monitor *mon,const QDict *qdict,QObject **ret);
include/net/slirp.h +2 -2
@@ -31,8 +31,8 @@#ifdef CONFIG_SLIRP -void net_slirp_hostfwd_add (Monitor *mon,const QDict *qdict); -void net_slirp_hostfwd_remove (Monitor *mon,const QDict *qdict); +void hmp_hostfwd_add (Monitor *mon,const QDict *qdict); +void hmp_hostfwd_remove (Monitor *mon,const QDict *qdict);int net_slirp_redir (const char *redir_str);
include/sysemu/block-backend.h +1 -1
@@ -70,7 +70,7 @@ BlockBackend *blk_next(BlockBackend *blk);BlockDriverState *blk_bs (BlockBackend *blk); -void blk_hide_on_behalf_of_do_drive_del (BlockBackend *blk); +void blk_hide_on_behalf_of_hmp_drive_del (BlockBackend *blk);void blk_iostatus_enable (BlockBackend *blk);int blk_attach_dev (BlockBackend *blk,void *dev);
include/sysemu/blockdev.h +2 -2
@@ -67,6 +67,6 @@ DriveInfo *add_init_drive(const char *opts);void qmp_change_blockdev (const char *device,const char *filename,const char *format,Error **errp); -void do_commit (Monitor *mon,const QDict *qdict); -int do_drive_del (Monitor *mon,const QDict *qdict,QObject **ret_data); +void hmp_commit (Monitor *mon,const QDict *qdict); +int hmp_drive_del (Monitor *mon,const QDict *qdict,QObject **ret_data);#endif
include/sysemu/sysemu.h +8 -8
@@ -74,9 +74,9 @@ void qemu_remove_exit_notifier(Notifier *notify);void qemu_add_machine_init_done_notifier (Notifier *notify); -void do_savevm (Monitor *mon,const QDict *qdict); +void hmp_savevm (Monitor *mon,const QDict *qdict);int load_vmstate (const char *name); -void do_delvm (Monitor *mon,const QDict *qdict); +void hmp_delvm (Monitor *mon,const QDict *qdict);void do_info_snapshots (Monitor *mon,const QDict *qdict);void qemu_announce_self (void );
@@ -175,16 +175,16 @@ extern const char *prom_envs[MAX_PROM_ENVS];extern unsigned int nb_prom_envs;/* pci-hotplug */ -void pci_device_hot_add (Monitor *mon,const QDict *qdict); +void hmp_pci_add (Monitor *mon,const QDict *qdict);int pci_drive_hot_add (Monitor *mon,const QDict *qdict,DriveInfo *dinfo); -void do_pci_device_hot_remove (Monitor *mon,const QDict *qdict); +void hmp_pci_del (Monitor *mon,const QDict *qdict);/* generic hotplug */ -void drive_hot_add (Monitor *mon,const QDict *qdict); +void hmp_drive_add (Monitor *mon,const QDict *qdict);/* pcie aer error injection */ void pcie_aer_inject_error_print (Monitor *mon,const QObject *data); -int do_pcie_aer_inject_error (Monitor *mon, +int hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict,QObject **ret_data);/* serial ports */
@@ -199,8 +199,8 @@ extern CharDriverState *serial_hds[MAX_SERIAL_PORTS];extern CharDriverState *parallel_hds[MAX_PARALLEL_PORTS ]; -void do_usb_add (Monitor *mon,const QDict *qdict); -void do_usb_del (Monitor *mon,const QDict *qdict); +void hmp_usb_add (Monitor *mon,const QDict *qdict); +void hmp_usb_del (Monitor *mon,const QDict *qdict);void usb_info (Monitor *mon,const QDict *qdict); void add_boot_device_path(int32_t bootindex, DeviceState *dev,
include/ui/console.h +1 -1
@@ -56,7 +56,7 @@ struct MouseTransformInfo {int a[7 ]; }; -void do_mouse_set (Monitor *mon,const QDict *qdict); +void hmp_mouse_set (Monitor *mon,const QDict *qdict);/* keysym is a unicode code except for special keys (see QEMU_KEY_xxx constants) */
monitor.c +25 -25
198 lines not on this page · raw message
net/net.c +2 -2
@@ -953,7 +953,7 @@ static int net_host_check_device(const char *device)return 0 ; } -void net_host_device_add (Monitor *mon,const QDict *qdict) +void hmp_host_net_add (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_str (qdict,"device" );const char *opts_str =qdict_get_try_str (qdict,"opts" );
@@ -980,7 +980,7 @@ void net_host_device_add(Monitor *mon, const QDict *qdict) } } -void net_host_device_remove (Monitor *mon,const QDict *qdict) +void hmp_host_net_remove (Monitor *mon,const QDict *qdict) {NetClientState *nc;int vlan_id =qdict_get_int (qdict,"vlan_id" );
net/slirp.c +2 -2
@@ -299,7 +299,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *vlan, } } -void net_slirp_hostfwd_remove (Monitor *mon,const QDict *qdict) +void hmp_hostfwd_remove (Monitor *mon,const QDict *qdict) {struct in_addr host_addr = { .s_addr =INADDR_ANY };int host_port;
@@ -420,7 +420,7 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str,return -1 ; } -void net_slirp_hostfwd_add (Monitor *mon,const QDict *qdict) +void hmp_hostfwd_add (Monitor *mon,const QDict *qdict) {const char *redir_str;SlirpState *s;
savevm.c +2 -2
@@ -1091,7 +1091,7 @@ static int del_existing_snapshots(Monitor *mon, const char *name)return 0 ; } -void do_savevm (Monitor *mon,const QDict *qdict) +void hmp_savevm (Monitor *mon,const QDict *qdict) {BlockDriverState *bs, *bs1;QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;
@@ -1295,7 +1295,7 @@ int load_vmstate(const char *name)return 0 ; } -void do_delvm (Monitor *mon,const QDict *qdict) +void hmp_delvm (Monitor *mon,const QDict *qdict) {BlockDriverState *bs;Error *err;
ui/input.c +1 -1
@@ -526,7 +526,7 @@ MouseInfoList *qmp_query_mice(Error **errp)return mice_list; } -void do_mouse_set (Monitor *mon,const QDict *qdict) +void hmp_mouse_set (Monitor *mon,const QDict *qdict) {QemuInputHandlerState *s;int index =qdict_get_int (qdict,"index" );
vl.c +2 -2
@@ -1284,7 +1284,7 @@ static int usb_parse(const char *cmdline)return r; } -void do_usb_add (Monitor *mon,const QDict *qdict) +void hmp_usb_add (Monitor *mon,const QDict *qdict) {const char *devname =qdict_get_str (qdict,"devname" );if (usb_device_add (devname) <0 ) {
@@ -1292,7 +1292,7 @@ void do_usb_add(Monitor *mon, const QDict *qdict) } } -void do_usb_del (Monitor *mon,const QDict *qdict) +void hmp_usb_del (Monitor *mon,const QDict *qdict) {const char *devname =qdict_get_str (qdict,"devname" );if (usb_device_del (devname) <0 ) {
Signature · 1 line
1.9.3
PATCH 3/3 hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
In reply to Markus ArmbrusterSome are called do_info_SUBCOMMAND() (old ones, usually), some hmp_info_SUBCOMMAND(), some SUBCOMMAND_info(), sometimes SUBCOMMAND pointlessly differs in spelling.
Normalize to hmp_info_SUBCOMMAND(), where SUBCOMMAND is exactly the subcommand name with '-' replaced by '_'.
Exceptions:
* sun4m_irq_info(), sun4m_pic_info() renamed to sun4m_hmp_info_irq(), sun4m_hmp_info_pic().
* lm32_irq_info(), lm32_pic_info() renamed to lm32_hmp_info_irq(), lm32_hmp_info_pic().
--- hw/core/loader.c | 2 +- hw/intc/i8259.c | 4 +-- hw/intc/lm32_pic.c | 4 +-- hw/sparc/sun4m.c | 4 +-- hw/usb/bus.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/usb/host-stub.c | 2 +- include/hw/i386/pc.h | 4 +-- include/hw/lm32/lm32_pic.h | 4 +-- include/hw/loader.h | 2 +- include/hw/sparc/sun4m.h | 4 +-- include/hw/usb.h | 2 +- include/monitor/qdev.h | 4 +-- include/net/net.h | 2 +- include/net/slirp.h | 2 +- include/sysemu/sysemu.h | 4 +-- monitor.c | 84 +++++++++++++++++++++++----------------------- net/net.c | 2 +- net/slirp.c | 2 +- qdev-monitor.c | 4 +-- savevm.c | 2 +- 21 files changed, 71 insertions(+), 71 deletions(-)
hw/core/loader.c +1 -1
@@ -1062,7 +1062,7 @@ void *rom_ptr(hwaddr addr)return rom->data + (addr - rom->addr); } -void do_info_roms (Monitor *mon,const QDict *qdict) +void hmp_info_roms (Monitor *mon,const QDict *qdict) {Rom *rom;
hw/intc/i8259.c +2 -2
@@ -429,7 +429,7 @@ static void pic_realize(DeviceState *dev, Error **errp) pc->parent_realize (dev, errp); } -void pic_info (Monitor *mon,const QDict *qdict) +void hmp_info_pic (Monitor *mon,const QDict *qdict) {int i;PICCommonState *s;
@@ -447,7 +447,7 @@ void pic_info(Monitor *mon, const QDict *qdict) } } -void irq_info (Monitor *mon,const QDict *qdict) +void hmp_info_irq (Monitor *mon,const QDict *qdict) {#ifndef DEBUG_IRQ_COUNT monitor_printf (mon,"irq statistic code not compiled.\n" );
hw/intc/lm32_pic.c +2 -2
@@ -43,7 +43,7 @@ struct LM32PicState {typedef struct LM32PicState LM32PicState ;static LM32PicState *pic; -void lm32_do_pic_info (Monitor *mon,const QDict *qdict) +void lm32_hmp_info_pic (Monitor *mon,const QDict *qdict) {if (pic ==NULL ) {return ;
@@ -53,7 +53,7 @@ void lm32_do_pic_info(Monitor *mon, const QDict *qdict) pic->im, pic->ip, pic->irq_state); } -void lm32_irq_info (Monitor *mon,const QDict *qdict) +void lm32_hmp_info_irq (Monitor *mon,const QDict *qdict) {int i;uint32_t count;
hw/sparc/sun4m.c +2 -2
@@ -176,13 +176,13 @@ static void nvram_init(M48t59State *nvram, uint8_t *macaddr,static DeviceState *slavio_intctl; -void sun4m_pic_info (Monitor *mon,const QDict *qdict) +void sun4m_hmp_info_pic (Monitor *mon,const QDict *qdict) {if (slavio_intctl)slavio_pic_info (mon, slavio_intctl); } -void sun4m_irq_info (Monitor *mon,const QDict *qdict) +void sun4m_hmp_info_irq (Monitor *mon,const QDict *qdict) {if (slavio_intctl)slavio_irq_info (mon, slavio_intctl);
hw/usb/bus.c +1 -1
@@ -627,7 +627,7 @@ static char *usb_get_fw_dev_path(DeviceState *qdev)return fw_path; } -void usb_info (Monitor *mon,const QDict *qdict) +void hmp_info_usb (Monitor *mon,const QDict *qdict) {USBBus *bus;USBDevice *dev;
hw/usb/host-libusb.c +1 -1
@@ -1637,7 +1637,7 @@ static void usb_host_auto_check(void *unused)timer_mod (usb_auto_timer,qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) +2000 ); } -void usb_host_info (Monitor *mon,const QDict *qdict) +void hmp_info_usbhost (Monitor *mon,const QDict *qdict) {libusb_device **devs =NULL ;struct libusb_device_descriptor ddesc;
hw/usb/host-stub.c +1 -1
@@ -35,7 +35,7 @@#include "hw/usb.h" #include "monitor/monitor.h" -void usb_host_info (Monitor *mon,const QDict *qdict) +void hmp_info_usbhost (Monitor *mon,const QDict *qdict) {monitor_printf (mon,"USB host devices not supported\n" ); }
include/hw/i386/pc.h +2 -2
@@ -136,8 +136,8 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq);qemu_irq *kvm_i8259_init (ISABus *bus);int pic_read_irq (DeviceState *d);int pic_get_output (DeviceState *d); -void pic_info (Monitor *mon,const QDict *qdict); -void irq_info (Monitor *mon,const QDict *qdict); +void hmp_info_pic (Monitor *mon,const QDict *qdict); +void hmp_info_irq (Monitor *mon,const QDict *qdict);/* Global System Interrupts */
include/hw/lm32/lm32_pic.h +2 -2
@@ -8,7 +8,7 @@ uint32_t lm32_pic_get_im(DeviceState *d);void lm32_pic_set_ip (DeviceState *d,uint32_t ip);void lm32_pic_set_im (DeviceState *d,uint32_t im); -void lm32_do_pic_info (Monitor *mon,const QDict *qdict); -void lm32_irq_info (Monitor *mon,const QDict *qdict); +void lm32_hmp_info_pic (Monitor *mon,const QDict *qdict); +void lm32_hmp_info_irq (Monitor *mon,const QDict *qdict);#endif /* QEMU_HW_LM32_PIC_H */
include/hw/loader.h +1 -1
@@ -78,7 +78,7 @@ void rom_load_done(void);void rom_set_fw (FWCfgState *f);int rom_copy (uint8_t *dest,hwaddr addr,size_t size);void *rom_ptr (hwaddr addr); -void do_info_roms (Monitor *mon,const QDict *qdict); +void hmp_info_roms (Monitor *mon,const QDict *qdict);#define rom_add_file_fixed (_f, _a, _i) \ rom_add_file(_f, NULL, _a, _i, false)
include/hw/sparc/sun4m.h +2 -2
@@ -29,8 +29,8 @@ void slavio_pic_info(Monitor *mon, DeviceState *dev);void slavio_irq_info (Monitor *mon,DeviceState *dev);/* sun4m.c */ -void sun4m_pic_info (Monitor *mon,const QDict *qdict); -void sun4m_irq_info (Monitor *mon,const QDict *qdict); +void sun4m_hmp_info_pic (Monitor *mon,const QDict *qdict); +void sun4m_hmp_info_irq (Monitor *mon,const QDict *qdict);/* sparc32_dma.c */ #include "hw/sparc/sparc32_dma.h"
include/hw/usb.h +1 -1
@@ -473,7 +473,7 @@ int set_usb_string(uint8_t *buf, const char *str);/* usb-linux.c */ USBDevice *usb_host_device_open (USBBus *bus,const char *devname); -void usb_host_info (Monitor *mon,const QDict *qdict); +void hmp_info_usbhost (Monitor *mon,const QDict *qdict);/* usb ports of the VM */
include/monitor/qdev.h +2 -2
@@ -6,8 +6,8 @@/*** monitor commands ***/ -void do_info_qtree (Monitor *mon,const QDict *qdict); -void do_info_qdm (Monitor *mon,const QDict *qdict); +void hmp_info_qtree (Monitor *mon,const QDict *qdict); +void hmp_info_qdm (Monitor *mon,const QDict *qdict);int do_device_add (Monitor *mon,const QDict *qdict,QObject **ret_data);int qdev_device_help (QemuOpts *opts);DeviceState *qdev_device_add (QemuOpts *opts);
include/net/net.h +1 -1
@@ -156,7 +156,7 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender, void *opaque);void print_net_client (Monitor *mon,NetClientState *nc); -void do_info_network (Monitor *mon,const QDict *qdict); +void hmp_info_network (Monitor *mon,const QDict *qdict);/* NIC info */
include/net/slirp.h +1 -1
@@ -40,7 +40,7 @@ int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *retint net_slirp_smb (const char *exported_dir); -void do_info_usernet (Monitor *mon,const QDict *qdict); +void hmp_info_usernet (Monitor *mon,const QDict *qdict);#endif
include/sysemu/sysemu.h +2 -2
@@ -77,7 +77,7 @@ void qemu_add_machine_init_done_notifier(Notifier *notify);void hmp_savevm (Monitor *mon,const QDict *qdict);int load_vmstate (const char *name);void hmp_delvm (Monitor *mon,const QDict *qdict); -void do_info_snapshots (Monitor *mon,const QDict *qdict); +void hmp_info_snapshots (Monitor *mon,const QDict *qdict);void qemu_announce_self (void );
@@ -201,7 +201,7 @@ extern CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];void hmp_usb_add (Monitor *mon,const QDict *qdict);void hmp_usb_del (Monitor *mon,const QDict *qdict); -void usb_info (Monitor *mon,const QDict *qdict); +void hmp_info_usb (Monitor *mon,const QDict *qdict);void add_boot_device_path (int32_t bootindex,DeviceState *dev,const char *suffix);
monitor.c +42 -42
311 lines not on this page · raw message
net/net.c +1 -1
@@ -1117,7 +1117,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,return filter_list; } -void do_info_network (Monitor *mon,const QDict *qdict) +void hmp_info_network (Monitor *mon,const QDict *qdict) {NetClientState *nc, *peer;NetClientOptionsKind type;
net/slirp.c +1 -1
@@ -681,7 +681,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str,return -1 ; } -void do_info_usernet (Monitor *mon,const QDict *qdict) +void hmp_info_usernet (Monitor *mon,const QDict *qdict) {SlirpState *s;
qdev-monitor.c +2 -2
@@ -667,13 +667,13 @@ static void qbus_print(Monitor *mon, BusState *bus, int indent) }#undef qdev_printf -void do_info_qtree (Monitor *mon,const QDict *qdict) +void hmp_info_qtree (Monitor *mon,const QDict *qdict) {if (sysbus_get_default ())qbus_print (mon,sysbus_get_default (),0 ); } -void do_info_qdm (Monitor *mon,const QDict *qdict) +void hmp_info_qdm (Monitor *mon,const QDict *qdict) {qdev_print_devinfos (true); }
savevm.c +1 -1
@@ -1323,7 +1323,7 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) } } -void do_info_snapshots (Monitor *mon,const QDict *qdict) +void hmp_info_snapshots (Monitor *mon,const QDict *qdict) {BlockDriverState *bs, *bs1;QEMUSnapshotInfo *sn_tab, *sn, s, *sn_info = &s;
Signature · 1 line
1.9.3
Am 12.02.2015 um 11:52 hat Markus Armbruster geschrieben:
Quoted 9 lines
When I can't guess a handler's name, I have to look it up in hmp-commands.hx. Happens often enough to annoy me. Let's make them more predictable.
Touches several subsystems because HMP command handlers are still spread far and wide, but the changes are trivial. Speak up if you want your subsystem's part routed through your tree rather than -trivial.
Quoted 6 lines
Cc Kevin Wolf <[email protected]>Cc Stefan Hajnoczi <[email protected]>Cc Michael Walle <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Jason Wang <[email protected]>
For the block layer parts:
Quoted 52 lines · Markus Armbruster
When I can't guess a handler's name, I have to look it up in hmp-commands.hx. Happens often enough to annoy me. Let's make them more predictable.
Touches several subsystems because HMP command handlers are still spread far and wide, but the changes are trivial. Speak up if you want your subsystem's part routed through your tree rather than -trivial.
Cc Kevin Wolf <[email protected]>Cc Stefan Hajnoczi <[email protected]>Cc Michael Walle <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Jason Wang <[email protected]>Markus Armbruster (3):
hmp: Clean up declarations for long-gone info handlers
hmp: Name HMP command handler functionshmp_COMMAND()
hmp: Name HMP info handler functionshmp_info_SUBCOMMAND()block/block-backend.c | 6 +- blockdev.c | 6 +- device-hotplug.c | 2 +- hmp-commands.hx | 86 +++++++++++++------------- hmp.c | 6 +- hmp.h | 6 +- hw/core/loader.c | 2 +- hw/intc/i8259.c | 4 +- hw/intc/lm32_pic.c | 4 +- hw/pci/pci-hotplug-old.c | 4 +- hw/pci/pci-stub.c | 2 +- hw/pci/pcie_aer.c | 2 +- hw/sparc/sun4m.c | 4 +- hw/usb/bus.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/usb/host-stub.c | 2 +- include/hw/i386/pc.h | 4 +- include/hw/lm32/lm32_pic.h | 4 +- include/hw/loader.h | 2 +- include/hw/sparc/sun4m.h | 4 +- include/hw/usb.h | 2 +- include/migration/migration.h | 4 -- include/monitor/qdev.h | 4 +- include/net/net.h | 6 +- include/net/slirp.h | 6 +- include/sysemu/block-backend.h | 2 +- include/sysemu/blockdev.h | 4 +- include/sysemu/sysemu.h | 23 +++---- include/ui/console.h | 2 +- include/ui/qemu-spice.h | 3 - monitor.c | 134
Quoted 12 lines
++++++++++++++++++++---------------------
net/net.c | 6 +- net/slirp.c | 6 +- qdev-monitor.c | 4 +- savevm.c | 6 +- ui/input.c | 2 +- vl.c | 4 +- 37 files changed, 181 insertions(+), 191 deletions(-)Signature · 1 line
1.9.3
For net parts: