OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Add wrappers to functions used by the Monitor

Browse Source 
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: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-08-28 15:27:08 -03:00 committed by Anthony Liguori
parent fb08dde098
commit 3818318682
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/pci-hotplug.c
View File

@ -203,6 +203,11 @@ void pci_device_hot_remove(Monitor *mon, const char *pci_addr)
qemu_system_device_hot_add(bus, slot, 0); 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) static int pci_match_fn(void *dev_private, void *arg)
{ {
PCIDevice *dev = dev_private; PCIDevice *dev = dev_private;

5
monitor.c
View File

@ -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) static void do_commit(Monitor *mon, const char *device)
{ {
int all_devices; int all_devices;

4
qemu-monitor.hx
View File

@ -9,7 +9,7 @@ STEXI
@table @option @table @option
ETEXI ETEXI
{ "help|?", "s?", help_cmd, "[cmd]", "show the help" }, { "help|?", "s?", do_help_cmd, "[cmd]", "show the help" },
STEXI STEXI
@item help or ? [@var{cmd}] @item help or ? [@var{cmd}]
Show the help for all commands or just for command @var{cmd}. Show the help for all commands or just for command @var{cmd}.
@ -517,7 +517,7 @@ Hot-add PCI device.
ETEXI ETEXI
#if defined(TARGET_I386) #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 #endif
STEXI STEXI
@item pci_del @item pci_del

1
sysemu.h
View File

@ -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, void pci_device_hot_add(Monitor *mon, const char *pci_addr, const char *type,
const char *opts); const char *opts);
void drive_hot_add(Monitor *mon, const char *pci_addr, 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(Monitor *mon, const char *pci_addr);
void pci_device_hot_remove_success(int pcibus, int slot); void pci_device_hot_remove_success(int pcibus, int slot);