commit b752daf03092b6720e39fdf7f4198eec95f71468
author Markus Armbruster <armbru@redhat.com> Wed May 12 10:53:01 2010 +0200
committer Luiz Capitulino <lcapitulino@redhat.com> Wed May 19 12:04:08 2010 -0300
tree 5ea997c3a75378f66e68a4526279622515afc904
parent 6c6a58aee425338bf67ec8faffdcda56b0b82090

Revert "monitor: Convert do_pci_device_hot_remove() to QObject"

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 <armbru@redhat.com>

hw/pci-hotplug.c

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 @@
     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"));
 }