Commit f8da93a0 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Paolo Bonzini
Browse files

i386: only parse the initrd_filename once for multiboot modules 



The multiboot code parses the initrd_filename twice, first to count how
many entries there are, and second to process each entry. This changes
the first loop to store the parse module names in a list, and the second
loop can now use these names. This avoids having to pass NULL to the
get_opt_value() method which means it can safely assume a non-NULL param.

Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-Id: <20180514171913.17664-3-berrange@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Tested-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6e3ad3f0

hw/i386/multiboot.c

+15 −17
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ int load_multiboot(FWCfgState *fw_cfg, 
    uint8_t bootinfo[MBI_SIZE];

    uint8_t *mb_bootinfo_data;

    uint32_t cmdline_len;

    GList *mods = NULL;



    /* Ok, let's see if it is a multiboot image.

       The header is 12x32bit long, so the latest entry may be 8192 - 48. */
@@ -291,17 +292,18 @@ int load_multiboot(FWCfgState *fw_cfg, 
    cmdline_len = strlen(kernel_filename) + 1;

    cmdline_len += strlen(kernel_cmdline) + 1;

    if (initrd_filename) {

        const char *r = get_opt_value(initrd_filename, NULL);

        const char *r = initrd_filename;

        cmdline_len += strlen(initrd_filename) + 1;

        while (1) {

        while (*r) {

            char *value;

            r = get_opt_value(r, &value);

            mbs.mb_mods_avail++;

            r = get_opt_value(r, NULL);

            if (!*r) {

                break;

            }

            mods = g_list_append(mods, value);

            if (*r) {

                r++;

            }

        }

    }



    mbs.mb_buf_size += cmdline_len;

    mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail;
@@ -314,20 +316,16 @@ int load_multiboot(FWCfgState *fw_cfg, 
    mbs.offset_cmdlines   = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE;

    mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len;



    if (initrd_filename) {

        const char *next_initrd;

        char not_last;

        char *one_file = NULL;



    if (mods) {

        GList *tmpl = mods;

        mbs.offset_mods = mbs.mb_buf_size;



        do {

        while (tmpl) {

            char *next_space;

            int mb_mod_length;

            uint32_t offs = mbs.mb_buf_size;

            char *one_file = tmpl->data;



            next_initrd = get_opt_value(initrd_filename, &one_file);

            not_last = *next_initrd;

            /* if a space comes after the module filename, treat everything

               after that as parameters */

            hwaddr c = mb_add_cmdline(&mbs, one_file);
@@ -352,10 +350,10 @@ int load_multiboot(FWCfgState *fw_cfg, 
            mb_debug("mod_start: %p\nmod_end:   %p\n  cmdline: "TARGET_FMT_plx,

                     (char *)mbs.mb_buf + offs,

                     (char *)mbs.mb_buf + offs + mb_mod_length, c);

            initrd_filename = next_initrd+1;

            g_free(one_file);

            one_file = NULL;

        } while (not_last);

            tmpl = tmpl->next;

        }

        g_list_free(mods);

    }



    /* Commandline support */