Commit bbe2d25c authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Markus Armbruster
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1455303747-19776-5-git-send-email-ehabkost@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 890ad550

vl.c

+6 −0
Original line number Diff line number Diff line
@@ -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)