ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20180514171913.17664-3-berrange@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Roman Kagan <rkagan@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-05-14 18:19:12 +01:00 committed by Paolo Bonzini
parent 6e3ad3f0e3
commit f8da93a0ff
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/i386/multiboot.c
View File

@ -161,6 +161,7 @@ int load_multiboot(FWCfgState *fw_cfg,
uint8_t bootinfo[MBI_SIZE]; uint8_t bootinfo[MBI_SIZE];
uint8_t *mb_bootinfo_data; uint8_t *mb_bootinfo_data;
uint32_t cmdline_len; uint32_t cmdline_len;
GList *mods = NULL;
/* Ok, let's see if it is a multiboot image. /* Ok, let's see if it is a multiboot image.
The header is 12x32bit long, so the latest entry may be 8192 - 48. */ The header is 12x32bit long, so the latest entry may be 8192 - 48. */
@ -291,15 +292,16 @@ int load_multiboot(FWCfgState *fw_cfg,
cmdline_len = strlen(kernel_filename) + 1; cmdline_len = strlen(kernel_filename) + 1;
cmdline_len += strlen(kernel_cmdline) + 1; cmdline_len += strlen(kernel_cmdline) + 1;
if (initrd_filename) { if (initrd_filename) {
const char *r = get_opt_value(initrd_filename, NULL); const char *r = initrd_filename;
cmdline_len += strlen(initrd_filename) + 1; cmdline_len += strlen(initrd_filename) + 1;
while (1) { while (*r) {
char *value;
r = get_opt_value(r, &value);
mbs.mb_mods_avail++; mbs.mb_mods_avail++;
r = get_opt_value(r, NULL); mods = g_list_append(mods, value);
if (!*r) { if (*r) {
break; r++;
} }
r++;
} }
} }
@ -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_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE;
mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len;
if (initrd_filename) { if (mods) {
const char *next_initrd; GList *tmpl = mods;
char not_last;
char *one_file = NULL;
mbs.offset_mods = mbs.mb_buf_size; mbs.offset_mods = mbs.mb_buf_size;
do { while (tmpl) {
char *next_space; char *next_space;
int mb_mod_length; int mb_mod_length;
uint32_t offs = mbs.mb_buf_size; 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 /* if a space comes after the module filename, treat everything
after that as parameters */ after that as parameters */
hwaddr c = mb_add_cmdline(&mbs, one_file); 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, mb_debug("mod_start: %p\nmod_end: %p\n cmdline: "TARGET_FMT_plx,
(char *)mbs.mb_buf + offs, (char *)mbs.mb_buf + offs,
(char *)mbs.mb_buf + offs + mb_mod_length, c); (char *)mbs.mb_buf + offs + mb_mod_length, c);
initrd_filename = next_initrd+1;
g_free(one_file); g_free(one_file);
one_file = NULL; tmpl = tmpl->next;
} while (not_last); }
g_list_free(mods);
} }
/* Commandline support */ /* Commandline support */