提交 38183186 编写于 作者: L Luiz Capitulino 提交者: Anthony Liguori

Add wrappers to functions used by the Monitor

Some functions exported to be used by the Monitor as command
handlers are also called in other places as regular functions.

When those functions got ported to use the Monitor dictionary
to pass argments, the callers will have to setup a dictionary
to be able to call them.

To avoid this problem, this commit add wrappers to those functions,
so that we change the wrapper to accept the dictionary, letting
the current functions as is.

The following wrappers are being added:

- do_help_cmd()
- do_pci_device_hot_remove()
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 fb08dde0
......@@ -203,6 +203,11 @@ void pci_device_hot_remove(Monitor *mon, const char *pci_addr)
qemu_system_device_hot_add(bus, slot, 0);
}
void do_pci_device_hot_remove(Monitor *mon, const char *pci_addr)
{
pci_device_hot_remove(mon, pci_addr);
}
static int pci_match_fn(void *dev_private, void *arg)
{
PCIDevice *dev = dev_private;
......
......@@ -251,6 +251,11 @@ static void help_cmd(Monitor *mon, const char *name)
}
}
static void do_help_cmd(Monitor *mon, const char *name)
{
help_cmd(mon, name);
}
static void do_commit(Monitor *mon, const char *device)
{
int all_devices;
......
......@@ -9,7 +9,7 @@ STEXI
@table @option
ETEXI
{ "help|?", "s?", help_cmd, "[cmd]", "show the help" },
{ "help|?", "s?", do_help_cmd, "[cmd]", "show the help" },
STEXI
@item help or ? [@var{cmd}]
Show the help for all commands or just for command @var{cmd}.
......@@ -517,7 +517,7 @@ Hot-add PCI device.
ETEXI
#if defined(TARGET_I386)
{ "pci_del", "s", pci_device_hot_remove, "[[<domain>:]<bus>:]<slot>", "hot remove PCI device" },
{ "pci_del", "s", do_pci_device_hot_remove, "[[<domain>:]<bus>:]<slot>", "hot remove PCI device" },
#endif
STEXI
@item pci_del
......
......@@ -212,6 +212,7 @@ void destroy_bdrvs(dev_match_fn *match_fn, void *arg);
void pci_device_hot_add(Monitor *mon, const char *pci_addr, const char *type,
const char *opts);
void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts);
void do_pci_device_hot_remove(Monitor *mon, const char *pci_addr);
void pci_device_hot_remove(Monitor *mon, const char *pci_addr);
void pci_device_hot_remove_success(int pcibus, int slot);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册