commit 71df1d833776647fc12f5bbcd6d6fe4c5e931094
author Markus Armbruster <armbru@redhat.com> Thu Mar 12 08:40:25 2015 +0100
committer Markus Armbruster <armbru@redhat.com> Tue Jun 09 07:40:23 2015 +0200
tree 84d2741b80f2e7ed1eaff0e25d0fc93d44cd09de
parent 1640b200d53e3d981f12a192fe84b7bb7958c065

QemuOpts: Convert qemu_opt_foreach() to Error

Retain the function value for now, to permit selective conversion of
its callers.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

vl.c

diff --git a/vl.c b/vl.c
index b12e6ff..d4b2d03 100644
--- a/vl.c
+++ b/vl.c
@@ -2576,8 +2576,9 @@
     free(mem);
 }
 
-static int machine_set_property(const char *name, const char *value,
-                                void *opaque)
+static int machine_set_property(void *opaque,
+                                const char *name, const char *value,
+                                Error **errp)
 {
     Object *obj = OBJECT(opaque);
     Error *local_err = NULL;
@@ -4070,8 +4071,8 @@
     }
 
     machine_opts = qemu_get_machine_opts();
-    if (qemu_opt_foreach(machine_opts, machine_set_property,
-                         current_machine)) {
+    if (qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
+                         NULL)) {
         object_unref(OBJECT(current_machine));
         exit(1);
     }