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>

qemu-monitor.hx

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 @@
         .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