diff options
| author | Peter Maydell | 2014-02-20 13:04:02 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-02-20 13:10:23 +0100 |
| commit | 4c0c9bbe78901a706497a8fa1a27935bafc20cf7 (patch) | |
| tree | 43fe900e8e748606dcdb0ef22d10068cc4608aaa /qdev-monitor.c | |
| parent | Fix QEMU build on OpenBSD on x86 archs (diff) | |
| parent | monitor: Add object_add class argument completion. (diff) | |
| download | qemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.tar.gz qemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.tar.xz qemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
monitor: Add object_add class argument completion.
monitor: Add object_del id argument completion.
monitor: Add device_add device argument completion.
monitor: Add device_del id argument completion.
qmp: expose list of supported character device backends
Use error_is_set() only when necessary
QMP: allow JSON dict arguments in qmp-shell
hmp: migrate command (without -d) now blocks correctly
Conflicts:
blockdev.c
[PMM: resolved trivial conflict in blockdev.c]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qdev-monitor.c')
| -rw-r--r-- | qdev-monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c index 1d3b68d40a..2d1ef8dac7 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -656,7 +656,7 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) DeviceState *dev; opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err); - if (error_is_set(&local_err)) { + if (local_err) { qerror_report_err(local_err); error_free(local_err); return -1; |