aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-05-12 10:53:01 +0200
committerLuiz Capitulino <lcapitulino@redhat.com>2010-05-19 12:04:08 -0300
commitb752daf03092b6720e39fdf7f4198eec95f71468 (patch)
tree5ea997c3a75378f66e68a4526279622515afc904 /hw
parent6c6a58aee425338bf67ec8faffdcda56b0b82090 (diff)
downloadqemu-b752daf03092b6720e39fdf7f4198eec95f71468.zip
qemu-b752daf03092b6720e39fdf7f4198eec95f71468.tar.gz
qemu-b752daf03092b6720e39fdf7f4198eec95f71468.tar.bz2
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/pci-hotplug.c5
1 files changed, 2 insertions, 3 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"));
}