diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-02-10 23:49:56 -0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-19 15:18:17 -0600 |
| commit | 053801bc4950ec797ab8b47b4189dcdf2a1fc016 (patch) | |
| tree | cef69c54e0c0aa1d4adb74608540a77a3d00d180 | |
| parent | 395560c8d15fb7980742990d00ae63aac87d43d6 (diff) | |
| download | qemu-053801bc4950ec797ab8b47b4189dcdf2a1fc016.tar.gz | |
Monitor: Convert pci_device_hot_remove() to cmd_new_ret()
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/pci-hotplug.c | 14 | ||||
| -rw-r--r-- | qemu-monitor.hx | 2 | ||||
| -rw-r--r-- | sysemu.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 6cc70d52c5..bd82c6aab7 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -296,26 +296,26 @@ int pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data) } #endif -void pci_device_hot_remove(Monitor *mon, const char *pci_addr) +int pci_device_hot_remove(Monitor *mon, const char *pci_addr) { PCIDevice *d; int dom, bus; unsigned slot; if (pci_read_devaddr(mon, pci_addr, &dom, &bus, &slot)) { - return; + return -1; } d = pci_find_device(pci_find_root_bus(0), bus, slot, 0); if (!d) { monitor_printf(mon, "slot %d empty\n", slot); - return; + return -1; } - qdev_unplug(&d->qdev); + return qdev_unplug(&d->qdev); } -void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict, - QObject **ret_data) +int do_pci_device_hot_remove(Monitor *mon, const QDict *qdict, + QObject **ret_data) { - pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr")); + return pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr")); } diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 2831055a74..e987cf100c 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -874,7 +874,7 @@ ETEXI .params = "[[<domain>:]<bus>:]<slot>", .help = "hot remove PCI device", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_pci_device_hot_remove, + .cmd_new_ret = do_pci_device_hot_remove, }, #endif @@ -215,9 +215,9 @@ DriveInfo *add_init_drive(const char *opts); void pci_device_hot_add_print(Monitor *mon, const QObject *data); int pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data); void drive_hot_add(Monitor *mon, const QDict *qdict); -void pci_device_hot_remove(Monitor *mon, const char *pci_addr); -void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict, - QObject **ret_data); +int pci_device_hot_remove(Monitor *mon, const char *pci_addr); +int do_pci_device_hot_remove(Monitor *mon, const QDict *qdict, + QObject **ret_data); /* serial ports */ |