summaryrefslogtreecommitdiffstats
path: root/qdev-monitor.c
diff options
context:
space:
mode:
authorMarkus Armbruster2015-03-12 07:45:10 +0100
committerMarkus Armbruster2015-06-09 07:40:23 +0200
commit1640b200d53e3d981f12a192fe84b7bb7958c065 (patch)
treebea7e4594fee170e218d8b83d43815649551a4b4 /qdev-monitor.c
parentblkdebug: Simplify passing of Error through qemu_opts_foreach() (diff)
downloadqemu-1640b200d53e3d981f12a192fe84b7bb7958c065.tar.gz
qemu-1640b200d53e3d981f12a192fe84b7bb7958c065.tar.xz
qemu-1640b200d53e3d981f12a192fe84b7bb7958c065.zip
QemuOpts: Drop qemu_opt_foreach() parameter abort_on_failure
When the argument is non-zero, qemu_opt_foreach() stops on callback returning non-zero, and returns that value. When the argument is zero, it doesn't stop, and returns the callback's value from the last iteration. The two callers that pass zero could just as well pass one: * qemu_spice_init()'s callback add_channel() either returns zero or exit()s. * config_write_opts()'s callback config_write_opt() always returns zero. Drop the parameter, and always stop. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qdev-monitor.c')
-rw-r--r--qdev-monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 9f17c81d9f..b7a2150577 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -564,7 +564,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
}
/* set properties */
- if (qemu_opt_foreach(opts, set_property, dev, 1) != 0) {
+ if (qemu_opt_foreach(opts, set_property, dev)) {
object_unparent(OBJECT(dev));
object_unref(OBJECT(dev));
return NULL;