izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' into staging

Browse Source 
hmp: Normalize HMP command handler names

# gpg: Signature made Wed Feb 18 10:59:44 2015 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2015-02-18:
  hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
  hmp: Name HMP command handler functions hmp_COMMAND()
  hmp: Clean up declarations for long-gone info handlers

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2015-02-25 13:14:37 +00:00
parent 3d30395f7f 1ce6be24df
commit 68b459eaa6
37 changed files with 181 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/block-backend.c
+3 -3
View File
@@ -145,7 +145,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);
}
@@ -206,7 +206,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)
{
@@ -282,7 +282,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
View File
@@ -1017,7 +1017,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;
@@ -1945,7 +1945,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;
@@ -1987,7 +1987,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
View File
@@ -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
View File
@@ -28,7 +28,7 @@ ETEXI
.args_type = "device:B",
.params = "device|all",
.help = "commit changes to the disk images (if -snapshot is used) or backing files",
.mhandler.cmd = do_commit,
.mhandler.cmd = hmp_commit,
},
STEXI
@@ -180,7 +180,7 @@ ETEXI
.params = "device",
.help = "remove host block device",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_drive_del,
.mhandler.cmd_new = hmp_drive_del,
},
STEXI
@@ -245,7 +245,7 @@ ETEXI
.args_type = "filename:F",
.params = "filename",
.help = "save screen into PPM image 'filename'",
.mhandler.cmd = hmp_screen_dump,
.mhandler.cmd = hmp_screendump,
},
STEXI
@@ -259,7 +259,7 @@ ETEXI
.args_type = "filename:F",
.params = "filename",
.help = "output logs to 'filename'",
.mhandler.cmd = do_logfile,
.mhandler.cmd = hmp_logfile,
},
STEXI
@@ -273,7 +273,7 @@ ETEXI
.args_type = "name:s,option:b",
.params = "name on|off",
.help = "changes status of a specific trace event",
.mhandler.cmd = do_trace_event_set_state,
.mhandler.cmd = hmp_trace_event,
},
STEXI
@@ -288,7 +288,7 @@ ETEXI
.args_type = "op:s?,arg:F?",
.params = "on|off|flush|set [arg]",
.help = "open, close, or flush trace file, or set a new file name",
.mhandler.cmd = do_trace_file,
.mhandler.cmd = hmp_trace_file,
},
STEXI
@@ -303,7 +303,7 @@ ETEXI
.args_type = "items:s",
.params = "item1[,...]",
.help = "activate logging of the specified items",
.mhandler.cmd = do_log,
.mhandler.cmd = hmp_log,
},
STEXI
@@ -317,7 +317,7 @@ ETEXI
.args_type = "name:s?",
.params = "[tag|id]",
.help = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",
.mhandler.cmd = do_savevm,
.mhandler.cmd = hmp_savevm,
},
STEXI
@@ -334,7 +334,7 @@ ETEXI
.args_type = "name:s",
.params = "tag|id",
.help = "restore a VM snapshot from its tag or id",
.mhandler.cmd = do_loadvm,
.mhandler.cmd = hmp_loadvm,
.command_completion = loadvm_completion,
},
@@ -350,7 +350,7 @@ ETEXI
.args_type = "name:s",
.params = "tag|id",
.help = "delete a VM snapshot from its tag or id",
.mhandler.cmd = do_delvm,
.mhandler.cmd = hmp_delvm,
.command_completion = delvm_completion,
},
@@ -365,7 +365,7 @@ ETEXI
.args_type = "option:s?",
.params = "[on|off]",
.help = "run emulation in singlestep mode or switch to normal mode",
.mhandler.cmd = do_singlestep,
.mhandler.cmd = hmp_singlestep,
},
STEXI
@@ -422,7 +422,7 @@ ETEXI
.args_type = "device:s?",
.params = "[device]",
.help = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'",
.mhandler.cmd = do_gdbserver,
.mhandler.cmd = hmp_gdbserver,
},
STEXI
@@ -436,7 +436,7 @@ ETEXI
.args_type = "fmt:/,addr:l",
.params = "/fmt addr",
.help = "virtual memory dump starting at 'addr'",
.mhandler.cmd = do_memory_dump,
.mhandler.cmd = hmp_memory_dump,
},
STEXI
@@ -450,7 +450,7 @@ ETEXI
.args_type = "fmt:/,addr:l",
.params = "/fmt addr",
.help = "physical memory dump starting at 'addr'",
.mhandler.cmd = do_physical_memory_dump,
.mhandler.cmd = hmp_physical_memory_dump,
},
STEXI
@@ -533,7 +533,7 @@ ETEXI
.args_type = "fmt:/,addr:i,index:i.",
.params = "/fmt addr",
.help = "I/O port read",
.mhandler.cmd = do_ioport_read,
.mhandler.cmd = hmp_ioport_read,
},
STEXI
@@ -545,7 +545,7 @@ ETEXI
.args_type = "fmt:/,addr:i,val:i",
.params = "/fmt addr value",
.help = "I/O port write",
.mhandler.cmd = do_ioport_write,
.mhandler.cmd = hmp_ioport_write,
},
STEXI
@@ -557,7 +557,7 @@ ETEXI
.args_type = "keys:s,hold-time:i?",
.params = "keys [hold_ms]",
.help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",
.mhandler.cmd = hmp_send_key,
.mhandler.cmd = hmp_sendkey,
.command_completion = sendkey_completion,
},
@@ -611,7 +611,7 @@ ETEXI
.args_type = "start:i,size:i",
.params = "addr size",
.help = "compute the checksum of a memory region",
.mhandler.cmd = do_sum,
.mhandler.cmd = hmp_sum,
},
STEXI
@@ -626,7 +626,7 @@ ETEXI
.args_type = "devname:s",
.params = "device",
.help = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",
.mhandler.cmd = do_usb_add,
.mhandler.cmd = hmp_usb_add,
},
STEXI
@@ -642,7 +642,7 @@ ETEXI
.args_type = "devname:s",
.params = "device",
.help = "remove USB device 'bus.addr'",
.mhandler.cmd = do_usb_del,
.mhandler.cmd = hmp_usb_del,
},
STEXI
@@ -706,7 +706,7 @@ ETEXI
.args_type = "dx_str:s,dy_str:s,dz_str:s?",
.params = "dx dy [dz]",
.help = "send mouse move events",
.mhandler.cmd = do_mouse_move,
.mhandler.cmd = hmp_mouse_move,
},
STEXI
@@ -721,7 +721,7 @@ ETEXI
.args_type = "button_state:i",
.params = "state",
.help = "change mouse button state (1=L, 2=M, 4=R)",
.mhandler.cmd = do_mouse_button,
.mhandler.cmd = hmp_mouse_button,
},
STEXI
@@ -735,7 +735,7 @@ ETEXI
.args_type = "index:i",
.params = "index",
.help = "set which mouse device receives events",
.mhandler.cmd = do_mouse_set,
.mhandler.cmd = hmp_mouse_set,
},
STEXI
@@ -753,7 +753,7 @@ ETEXI
.args_type = "path:F,freq:i?,bits:i?,nchannels:i?",
.params = "path [frequency [bits [channels]]]",
.help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",
.mhandler.cmd = do_wav_capture,
.mhandler.cmd = hmp_wavcapture,
},
STEXI
@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]
@@ -774,7 +774,7 @@ ETEXI
.args_type = "n:i",
.params = "capture index",
.help = "stop capture",
.mhandler.cmd = do_stop_capture,
.mhandler.cmd = hmp_stopcapture,
},
STEXI
@item stopcapture @var{index}
@@ -818,7 +818,7 @@ ETEXI
.args_type = "bootdevice:s",
.params = "bootdevice",
.help = "define new values for the boot device list",
.mhandler.cmd = do_boot_set,
.mhandler.cmd = hmp_boot_set,
},
STEXI
@@ -837,7 +837,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "inject an NMI",
.mhandler.cmd = hmp_inject_nmi,
.mhandler.cmd = hmp_nmi,
},
STEXI
@item nmi @var{cpu}
@@ -1140,7 +1140,7 @@ ETEXI
"[,snapshot=on|off][,cache=on|off]\n"
"[,readonly=on|off][,copy-on-read=on|off]",
.help = "add drive to PCI storage controller",
.mhandler.cmd = drive_hot_add,
.mhandler.cmd = hmp_drive_add,
},
STEXI
@@ -1155,7 +1155,7 @@ ETEXI
.args_type = "pci_addr:s,type:s,opts:s?",
.params = "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...",
.help = "hot-add PCI device",
.mhandler.cmd = pci_device_hot_add,
.mhandler.cmd = hmp_pci_add,
},
#endif
@@ -1171,7 +1171,7 @@ ETEXI
.args_type = "pci_addr:s",
.params = "[[<domain>:]<bus>:]<slot>",
.help = "hot remove PCI device",
.mhandler.cmd = do_pci_device_hot_remove,
.mhandler.cmd = hmp_pci_del,
},
#endif
@@ -1197,7 +1197,7 @@ ETEXI
"<tlb header> = 32bit x 4\n\t\t\t"
"<tlb header prefix> = 32bit x 4",
.user_print = pcie_aer_inject_error_print,
.mhandler.cmd_new = do_pcie_aer_inject_error,
.mhandler.cmd_new = hmp_pcie_aer_inject_error,
},
STEXI
@@ -1211,7 +1211,7 @@ ETEXI
.args_type = "device:s,opts:s?",
.params = "tap|user|socket|vde|netmap|bridge|vhost-user|dump [options]",
.help = "add host VLAN client",
.mhandler.cmd = net_host_device_add,
.mhandler.cmd = hmp_host_net_add,
.command_completion = host_net_add_completion,
},
@@ -1226,7 +1226,7 @@ ETEXI
.args_type = "vlan_id:i,device:s",
.params = "vlan_id name",
.help = "remove host VLAN client",
.mhandler.cmd = net_host_device_remove,
.mhandler.cmd = hmp_host_net_remove,
.command_completion = host_net_remove_completion,
},
@@ -1302,7 +1302,7 @@ ETEXI
.args_type = "arg1:s,arg2:s?,arg3:s?",
.params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
.help = "redirect TCP or UDP connections from host to guest (requires -net user)",
.mhandler.cmd = net_slirp_hostfwd_add,
.mhandler.cmd = hmp_hostfwd_add,
},
#endif
STEXI
@@ -1317,7 +1317,7 @@ ETEXI
.args_type = "arg1:s,arg2:s?,arg3:s?",
.params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
.help = "remove host-to-guest TCP or UDP redirection",
.mhandler.cmd = net_slirp_hostfwd_remove,
.mhandler.cmd = hmp_hostfwd_remove,
},
#endif
@@ -1361,7 +1361,7 @@ ETEXI
.args_type = "action:s",
.params = "[reset|shutdown|poweroff|pause|debug|none]",
.help = "change watchdog action",
.mhandler.cmd = do_watchdog_action,
.mhandler.cmd = hmp_watchdog_action,
.command_completion = watchdog_action_completion,
},
@@ -1376,7 +1376,7 @@ ETEXI
.args_type = "aclname:s",
.params = "aclname",
.help = "list rules in the access control list",
.mhandler.cmd = do_acl_show,
.mhandler.cmd = hmp_acl_show,
},
STEXI
@@ -1393,7 +1393,7 @@ ETEXI
.args_type = "aclname:s,policy:s",
.params = "aclname allow|deny",
.help = "set default access control list policy",
.mhandler.cmd = do_acl_policy,
.mhandler.cmd = hmp_acl_policy,
},
STEXI
@@ -1409,7 +1409,7 @@ ETEXI
.args_type = "aclname:s,match:s,policy:s,index:i?",
.params = "aclname match allow|deny [index]",
.help = "add a match rule to the access control list",
.mhandler.cmd = do_acl_add,
.mhandler.cmd = hmp_acl_add,
},
STEXI
@@ -1428,7 +1428,7 @@ ETEXI
.args_type = "aclname:s,match:s",
.params = "aclname match",
.help = "remove a match rule from the access control list",
.mhandler.cmd = do_acl_remove,
.mhandler.cmd = hmp_acl_remove,
},
STEXI
@@ -1442,7 +1442,7 @@ ETEXI
.args_type = "aclname:s",
.params = "aclname",
.help = "reset the access control list",
.mhandler.cmd = do_acl_reset,
.mhandler.cmd = hmp_acl_reset,
},
STEXI
@@ -1504,7 +1504,7 @@ ETEXI
.args_type = "broadcast:-b,cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l",
.params = "[-b] cpu bank status mcgstatus addr misc",
.help = "inject a MCE on the given CPU [and broadcast to other CPUs with -b option]",
.mhandler.cmd = do_inject_mce,
.mhandler.cmd = hmp_mce,
},
#endif
@@ -1694,7 +1694,7 @@ ETEXI
.args_type = "item:s?",
.params = "[subcommand]",
.help = "show various information about the system state",
.mhandler.cmd = do_info_help,
.mhandler.cmd = hmp_info_help,
.sub_table = info_cmds,
},
hmp.c
+3 -3
View File
@@ -924,7 +924,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;
@@ -1533,7 +1533,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;
@@ -1602,7 +1602,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
View File
@@ -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/core/loader.c
+1 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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/pci/pci-hotplug-old.c
+2 -2
View File
@@ -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
View File
@@ -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
View File
@@ -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");
hw/sparc/sun4m.c
+2 -2
View File
@@ -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
View File
@@ -637,7 +637,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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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"

Some files were not shown because too many files have changed in this diff Show More