Skip to content

Commit

Permalink
pc: Use qemu_opt_set() instead of qemu_opts_parse()
Browse files Browse the repository at this point in the history
Less code, same result.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
  • Loading branch information
Markus Armbruster committed Feb 26, 2015
1 parent 62b3de6 commit 5bdb59a
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions hw/i386/pc.c
Expand Up @@ -1137,23 +1137,18 @@ void pc_acpi_init(const char *default_dsdt)
if (filename == NULL) {
fprintf(stderr, "WARNING: failed to find %s\n", default_dsdt);
} else {
char *arg;
QemuOpts *opts;
QemuOpts *opts = qemu_opts_create(qemu_find_opts("acpi"), NULL, 0,
&error_abort);
Error *err = NULL;

arg = g_strdup_printf("file=%s", filename);

/* creates a deep copy of "arg" */
opts = qemu_opts_parse(qemu_find_opts("acpi"), arg, 0);
g_assert(opts != NULL);
qemu_opt_set(opts, "file", filename, &error_abort);

acpi_table_add_builtin(opts, &err);
if (err) {
error_report("WARNING: failed to load %s: %s", filename,
error_get_pretty(err));
error_free(err);
}
g_free(arg);
g_free(filename);
}
}
Expand Down

0 comments on commit 5bdb59a

Please sign in to comment.