david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vl: Set error location when parsing memory options

Browse Source 
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>
This commit is contained in:
Eduardo Habkost 2016-02-12 17:02:27 -02:00 committed by Markus Armbruster
parent 890ad5508e
commit bbe2d25c8f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vl.c
View File

@ -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 char *maxmem_str, *slots_str;
const ram_addr_t default_ram_size = mc->default_ram_size; const ram_addr_t default_ram_size = mc->default_ram_size;
QemuOpts *opts = qemu_find_opts_singleton("memory"); QemuOpts *opts = qemu_find_opts_singleton("memory");
Location loc;
loc_push_none(&loc);
qemu_opts_loc_restore(opts);
sz = 0; sz = 0;
mem_str = qemu_opt_get(opts, "size"); 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"); "'%s' option", slots_str ? "maxmem" : "slots");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
loc_pop(&loc);
} }
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)