From patchwork Fri Feb 19 13:27:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 8361071 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9C742C0553 for ; Fri, 19 Feb 2016 13:29:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E8302041D for ; Fri, 19 Feb 2016 13:29:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6546720382 for ; Fri, 19 Feb 2016 13:29:45 +0000 (UTC) Received: from localhost ([::1]:52295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWl7w-0007qm-Ob for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 08:29:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWl6D-0004qe-6s for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:27:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWl6C-0000In-5O for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:27:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWl6B-0000IN-W0 for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:27:56 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id A37D751E for ; Fri, 19 Feb 2016 13:27:55 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-67.ams2.redhat.com [10.36.116.67]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1JDRrup020405 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 19 Feb 2016 08:27:55 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B6F49303E3F3; Fri, 19 Feb 2016 14:27:49 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2016 14:27:47 +0100 Message-Id: <1455888469-3206-4-git-send-email-armbru@redhat.com> In-Reply-To: <1455888469-3206-1-git-send-email-armbru@redhat.com> References: <1455888469-3206-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Eduardo Habkost Subject: [Qemu-devel] [PULL 3/5] replay: Set error location properly when parsing options 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eduardo Habkost Set error location so the error_report() calls will show appropriate command-line argument or config file info. Signed-off-by: Eduardo Habkost Message-Id: <1455303747-19776-4-git-send-email-ehabkost@redhat.com> Reviewed-by: Laszlo Ersek Signed-off-by: Markus Armbruster --- replay/replay.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/replay/replay.c b/replay/replay.c index 9cac178..f8739c2 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -262,6 +262,14 @@ void replay_configure(QemuOpts *opts) const char *fname; const char *rr; ReplayMode mode = REPLAY_MODE_NONE; + Location loc; + + if (!opts) { + return; + } + + loc_push_none(&loc); + qemu_opts_loc_restore(opts); rr = qemu_opt_get(opts, "rr"); if (!rr) { @@ -283,6 +291,8 @@ void replay_configure(QemuOpts *opts) } replay_enable(fname, mode); + + loc_pop(&loc); } void replay_start(void)