ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: Clean up -machine handling 

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 <pbonzini@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2014-07-23 16:16:26 +02:00
parent 8af734ca31
commit d2659e27e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vl.c
View File

@ -2841,15 +2841,15 @@ static void free_and_trace(gpointer mem)
free(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); Object *obj = OBJECT(opaque);
StringInputVisitor *siv; StringInputVisitor *siv;
Error *local_err = NULL; Error *local_err = NULL;
char *c, *qom_name; char *c, *qom_name;
if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0 || if (strcmp(name, "type") == 0) {
strcmp(name, "type") == 0) {
return 0; return 0;
} }
@ -4254,7 +4254,7 @@ int main(int argc, char **argv, char **envp)
} }
machine_opts = qemu_get_machine_opts(); 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) { 1) < 0) {
object_unref(OBJECT(current_machine)); object_unref(OBJECT(current_machine));
exit(1); exit(1);