OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert "monitor: Convert do_pci_device_hot_remove() to QObject"

Browse Source 
We don't want pci_del in QMP.  Use device_del instead.

This reverts commit 6848d82716.

Conflicts:

	hw/pci-hotplug.c
	sysemu.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2010-05-12 10:53:01 +02:00 committed by Luiz Capitulino
parent 6c6a58aee4
commit b752daf030
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/pci-hotplug.c
View File

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

3
qemu-monitor.hx
View File

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

3
sysemu.h
View File

@ -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 */