[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/13] pc: Use qemu_opt_set() instead of qemu_opts_pa
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 12/13] pc: Use qemu_opt_set() instead of qemu_opts_parse() |
Date: |
Thu, 26 Feb 2015 15:07:27 +0100 |
Less code, same result.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/i386/pc.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 05008cb..51b4cf5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1137,15 +1137,11 @@ 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) {
@@ -1153,7 +1149,6 @@ void pc_acpi_init(const char *default_dsdt)
error_get_pretty(err));
error_free(err);
}
- g_free(arg);
g_free(filename);
}
}
--
1.9.3
- [Qemu-devel] [PULL 01/13] QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use, (continued)
- [Qemu-devel] [PULL 01/13] QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 02/13] QemuOpts: Convert qemu_opt_set_number() to Error, fix its use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 04/13] qemu-img: Suppress unhelpful extra errors in convert, resize, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 10/13] block: Simplify setting numeric options, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 07/13] QemuOpts: Propagate errors through opts_do_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 08/13] QemuOpts: Propagate errors through opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 11/13] qemu-sockets: Simplify setting numeric and boolean options, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 06/13] QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv_img_create(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 13/13] qtest: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 12/13] pc: Use qemu_opt_set() instead of qemu_opts_parse(),
Markus Armbruster <=
- [Qemu-devel] [PULL 09/13] qemu-img: Suppress unhelpful extra errors in convert, amend, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 03/13] QemuOpts: Convert qemu_opts_set() to Error, fix its use, Markus Armbruster, 2015/02/26