diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-17 09:44:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-17 09:44:37 -0500 |
| commit | 4a39943bd1fd2ac7e3163f9d9b056394519661f3 (patch) | |
| tree | eab01e0258d2344117873952b589bac333bb0ea3 /hw/qdev.h | |
| parent | 7d834c7450245335db0a7055ccdc783ccab21935 (diff) | |
| parent | 8bc27249f0f62524887ea355a6604722edd276a9 (diff) | |
Merge remote branch 'markus/qerror' into staging
Diffstat (limited to 'hw/qdev.h')
| -rw-r--r-- | hw/qdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -175,7 +175,7 @@ void qbus_free(BusState *bus); void do_info_qtree(Monitor *mon); void do_info_qdm(Monitor *mon); -void do_device_add(Monitor *mon, const QDict *qdict); +int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_device_del(Monitor *mon, const QDict *qdict); /*** qdev-properties.c ***/ |