From patchwork Mon Feb 16 14:44:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 440174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0E200140216 for ; Tue, 17 Feb 2015 01:48:32 +1100 (AEDT) Received: from localhost ([::1]:40029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNMyM-0005CE-9I for incoming@patchwork.ozlabs.org; Mon, 16 Feb 2015 09:48:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNMuX-0006ZW-S9 for qemu-devel@nongnu.org; Mon, 16 Feb 2015 09:44:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNMuW-00045E-LW for qemu-devel@nongnu.org; Mon, 16 Feb 2015 09:44:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNMuW-00044l-6T for qemu-devel@nongnu.org; Mon, 16 Feb 2015 09:44:32 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1GEiUAs018410 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 16 Feb 2015 09:44:31 -0500 Received: from blackfin.pond.sub.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1GEiS8D012446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 16 Feb 2015 09:44:30 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D3D883043FE3; Mon, 16 Feb 2015 15:44:25 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 16 Feb 2015 15:44:24 +0100 Message-Id: <1424097865-3973-13-git-send-email-armbru@redhat.com> In-Reply-To: <1424097865-3973-1-git-send-email-armbru@redhat.com> References: <1424097865-3973-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, kraxel@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 12/13] pc: Use qemu_opt_set() instead of qemu_opts_parse() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Less code, same result. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- 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); } }