[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] vl: Set error location when parsing memory optio
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 4/5] vl: Set error location when parsing memory options |
Date: |
Fri, 19 Feb 2016 14:27:48 +0100 |
From: Eduardo Habkost <address@hidden>
Set error location so the error_report() calls will show
appropriate command-line argument or config file info.
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
vl.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/vl.c b/vl.c
index bf0ef90..8c1a1ff 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)
--
2.4.3
- [Qemu-devel] [PULL 0/5] Error reporting patches for 2016-02-19, Markus Armbruster, 2016/02/19
- [Qemu-devel] [PULL 5/5] vl: Clean up machine selection in main()., Markus Armbruster, 2016/02/19
- [Qemu-devel] [PULL 4/5] vl: Set error location when parsing memory options,
Markus Armbruster <=
- [Qemu-devel] [PULL 2/5] vl: Reset location after handling command-line arguments, Markus Armbruster, 2016/02/19
- [Qemu-devel] [PULL 3/5] replay: Set error location properly when parsing options, Markus Armbruster, 2016/02/19
- [Qemu-devel] [PULL 1/5] vl.c: Fix regression in machine error message, Markus Armbruster, 2016/02/19
- Re: [Qemu-devel] [PULL 0/5] Error reporting patches for 2016-02-19, Peter Maydell, 2016/02/19