From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
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 [thread overview]
Message-ID: <1424959648-14721-13-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1424959648-14721-1-git-send-email-armbru@redhat.com>
Less code, same result.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
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
next prev parent reply other threads:[~2015-02-26 14:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 14:07 [Qemu-devel] [PULL 00/13] QemuOpts: Convert various setters to Error Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 01/13] QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 02/13] QemuOpts: Convert qemu_opt_set_number() " Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 03/13] QemuOpts: Convert qemu_opts_set() " Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 04/13] qemu-img: Suppress unhelpful extra errors in convert, resize Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv_img_create() Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 06/13] QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 07/13] QemuOpts: Propagate errors through opts_do_parse() Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 08/13] QemuOpts: Propagate errors through opts_parse() Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 09/13] qemu-img: Suppress unhelpful extra errors in convert, amend Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 10/13] block: Simplify setting numeric options Markus Armbruster
2015-02-26 14:07 ` [Qemu-devel] [PULL 11/13] qemu-sockets: Simplify setting numeric and boolean options Markus Armbruster
2015-02-26 14:07 ` Markus Armbruster [this message]
2015-02-26 14:07 ` [Qemu-devel] [PULL 13/13] qtest: Use qemu_opt_set() instead of qemu_opts_parse() Markus Armbruster
2015-03-03 10:03 ` [Qemu-devel] [PULL 00/13] QemuOpts: Convert various setters to Error Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424959648-14721-13-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).