From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 12 Feb 2016 19:02:27 +0000 (-0200)
Subject: vl: Set error location when parsing memory options
X-Git-Tag: v2.6.0-rc0~97^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbe2d25c8f89db4f0075a1321b1911b42d97e436;p=thirdparty%2Fqemu.git

vl: Set error location when parsing memory 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-5-git-send-email-ehabkost@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/vl.c b/vl.c
index bf0ef90cf9c..8c1a1ffbc54 100644
--- a/vl.c
+++ b/vl.c
@@ -2863,6 +2863,10 @@ static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
     const char *maxmem_str, *slots_str;
     const ram_addr_t default_ram_size = mc->default_ram_size;
     QemuOpts *opts = qemu_find_opts_singleton("memory");
+    Location loc;
+
+    loc_push_none(&loc);
+    qemu_opts_loc_restore(opts);
 
     sz = 0;
     mem_str = qemu_opt_get(opts, "size");
@@ -2937,6 +2941,8 @@ static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
                 "'%s' option", slots_str ? "maxmem" : "slots");
         exit(EXIT_FAILURE);
     }
+
+    loc_pop(&loc);
 }
 
 int main(int argc, char **argv, char **envp)