[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/21] Monitor: Convert pci_device_hot_remove() to c
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 10/21] Monitor: Convert pci_device_hot_remove() to cmd_new_ret() |
Date: |
Wed, 10 Feb 2010 23:49:56 -0200 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
hw/pci-hotplug.c | 14 +++++++-------
qemu-monitor.hx | 2 +-
sysemu.h | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 6cc70d5..bd82c6a 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 2831055..e987cf1 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
diff --git a/sysemu.h b/sysemu.h
index d41a338..8ba618e 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -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 */
--
1.6.6
- [Qemu-devel] [PATCH 01/21] Monitor: Introduce cmd_new_ret(), (continued)
- [Qemu-devel] [PATCH 01/21] Monitor: Introduce cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 03/21] Monitor: Convert do_cont() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 02/21] Monitor: Convert simple handlers to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 04/21] Monitor: Convert do_eject() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 05/21] Monitor: Convert do_cpu_set() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 06/21] Monitor: Convert do_block_set_passwd() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 07/21] Monitor: Convert do_getfd() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 08/21] Monitor: Convert do_closefd() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 09/21] Monitor: Convert pci_device_hot_add() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 10/21] Monitor: Convert pci_device_hot_remove() to cmd_new_ret(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 11/21] Monitor: Convert do_migrate() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 12/21] Monitor: Convert do_memory_save() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 13/21] Monitor: Convert do_physical_memory_save() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 14/21] Monitor: Convert do_info() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 15/21] Monitor: Convert do_change() to cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 16/21] Monitor: Rename cmd_new_ret(), Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 17/21] Monitor: Debugging support, Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 18/21] Monitor: Drop the print disabling mechanism, Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 19/21] Monitor: Audit handler return, Luiz Capitulino, 2010/02/10
- [Qemu-devel] [PATCH 20/21] Monitor: Debug stray prints the right way, Luiz Capitulino, 2010/02/10