[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] Revert "monitor: Convert do_pci_device_hot_remo
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 3/7] Revert "monitor: Convert do_pci_device_hot_remove() to QObject" |
Date: |
Wed, 19 May 2010 13:02:58 -0300 |
From: Markus Armbruster <address@hidden>
We don't want pci_del in QMP. Use device_del instead.
This reverts commit 6848d827162fea039f2658414a4adb6164a4f9b0.
Conflicts:
hw/pci-hotplug.c
sysemu.h
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/pci-hotplug.c | 5 ++---
qemu-monitor.hx | 3 +--
sysemu.h | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 22a7ce4..37ac015 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -277,8 +277,7 @@ int pci_device_hot_remove(Monitor *mon, const char
*pci_addr)
return qdev_unplug(&d->qdev);
}
-int do_pci_device_hot_remove(Monitor *mon, const QDict *qdict,
- QObject **ret_data)
+void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict)
{
- return pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr"));
+ pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr"));
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index fba4c3f..b6e3467 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -874,8 +874,7 @@ ETEXI
.args_type = "pci_addr:s",
.params = "[[<domain>:]<bus>:]<slot>",
.help = "hot remove PCI device",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_pci_device_hot_remove,
+ .mhandler.cmd = do_pci_device_hot_remove,
},
#endif
diff --git a/sysemu.h b/sysemu.h
index 47975b5..643c0c6 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -204,8 +204,7 @@ DriveInfo *add_init_drive(const char *opts);
void pci_device_hot_add(Monitor *mon, const QDict *qdict);
void drive_hot_add(Monitor *mon, const QDict *qdict);
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);
+void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
/* serial ports */
--
1.7.1.86.g0e460
- [Qemu-devel] [PATCH 0/7][PULL]: QMP/Monitor queue, Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 1/7] QMP: Add "Downstream extension of QMP" to spec, Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 2/7] Revert "PCI: Convert pci_device_hot_add() to QObject", Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 3/7] Revert "monitor: Convert do_pci_device_hot_remove() to QObject",
Luiz Capitulino <=
- [Qemu-devel] [PATCH 4/7] Revert "Monitor: Return before exiting with 'quit'", Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 5/7] sysemu: Export 'no_shutdown', Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 6/7] Monitor: Return before exiting with 'quit', Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 7/7] Fix qtypes' licenses, Luiz Capitulino, 2010/05/19