summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-02-12 17:02:26 -0200
committerMarkus Armbruster <armbru@redhat.com>2016-02-19 13:46:44 +0100
commit890ad5508e0e450272faa4b38611b9df5bab871a (patch)
treeaa9ec896080581875378c663bd6bd09db07e8725
parent43fa1e0bd98887fb5ead745de13dc9961799e97e (diff)
downloadfocaccia-qemu-890ad5508e0e450272faa4b38611b9df5bab871a.tar.gz
focaccia-qemu-890ad5508e0e450272faa4b38611b9df5bab871a.zip
replay: Set error location properly when parsing options
Set error location so the error_report() calls will show
appropriate command-line argument or config file info.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1455303747-19776-4-git-send-email-ehabkost@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--replay/replay.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/replay/replay.c b/replay/replay.c
index 9cac178697..f8739c26c8 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)