From d2659e27e1ec0b5126faa0f4fef78755950b39e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 Jul 2014 16:16:26 +0200 Subject: [PATCH] machine: Clean up -machine handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since commit c4090f8, -object options are no longer handled through object_set_property(), so clean up -object leftovers by renaming the function and dropping special-casing of qom-type and id properties. Cc: Paolo Bonzini Reviewed-by: Marcel Apfelbaum Signed-off-by: Andreas Färber --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index a9fd207..9c9acf5 100644 --- a/vl.c +++ b/vl.c @@ -2841,15 +2841,15 @@ static void free_and_trace(gpointer mem) free(mem); } -static int object_set_property(const char *name, const char *value, void *opaque) +static int machine_set_property(const char *name, const char *value, + void *opaque) { Object *obj = OBJECT(opaque); StringInputVisitor *siv; Error *local_err = NULL; char *c, *qom_name; - if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0 || - strcmp(name, "type") == 0) { + if (strcmp(name, "type") == 0) { return 0; } @@ -4254,7 +4254,7 @@ int main(int argc, char **argv, char **envp) } machine_opts = qemu_get_machine_opts(); - if (qemu_opt_foreach(machine_opts, object_set_property, current_machine, + if (qemu_opt_foreach(machine_opts, machine_set_property, current_machine, 1) < 0) { object_unref(OBJECT(current_machine)); exit(1); -- 2.7.4