|
 |
4ec855 |
From b9d1e72a0910c3a0d11cb0a3c863938de344e0f5 Mon Sep 17 00:00:00 2001
|
|
|
4ec855 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
4ec855 |
Date: Thu, 12 Sep 2019 13:05:02 +0100
|
|
|
4ec855 |
Subject: [PATCH 05/22] i386: only parse the initrd_filename once for multiboot
|
|
|
4ec855 |
modules
|
|
|
4ec855 |
MIME-Version: 1.0
|
|
|
4ec855 |
Content-Type: text/plain; charset=UTF-8
|
|
|
4ec855 |
Content-Transfer-Encoding: 8bit
|
|
|
4ec855 |
|
|
|
4ec855 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
4ec855 |
Message-id: <20190912130503.14094-6-lersek@redhat.com>
|
|
|
4ec855 |
Patchwork-id: 90438
|
|
|
4ec855 |
O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 5/6] i386: only parse the initrd_filename once for multiboot modules
|
|
|
4ec855 |
Bugzilla: 1749022
|
|
|
4ec855 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
4ec855 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
4ec855 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4ec855 |
|
|
|
4ec855 |
From: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
4ec855 |
|
|
|
4ec855 |
The multiboot code parses the initrd_filename twice, first to count how
|
|
|
4ec855 |
many entries there are, and second to process each entry. This changes
|
|
|
4ec855 |
the first loop to store the parse module names in a list, and the second
|
|
|
4ec855 |
loop can now use these names. This avoids having to pass NULL to the
|
|
|
4ec855 |
get_opt_value() method which means it can safely assume a non-NULL param.
|
|
|
4ec855 |
|
|
|
4ec855 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
4ec855 |
Message-Id: <20180514171913.17664-3-berrange@redhat.com>
|
|
|
4ec855 |
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4ec855 |
Tested-by: Roman Kagan <rkagan@virtuozzo.com>
|
|
|
4ec855 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4ec855 |
(cherry picked from commit f8da93a0ffa09268815c1942732cbc616a7db847)
|
|
|
4ec855 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
4ec855 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
4ec855 |
---
|
|
|
4ec855 |
hw/i386/multiboot.c | 32 +++++++++++++++-----------------
|
|
|
4ec855 |
1 file changed, 15 insertions(+), 17 deletions(-)
|
|
|
4ec855 |
|
|
|
4ec855 |
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
|
|
|
4ec855 |
index 8e26545..d519e20 100644
|
|
|
4ec855 |
--- a/hw/i386/multiboot.c
|
|
|
4ec855 |
+++ b/hw/i386/multiboot.c
|
|
|
4ec855 |
@@ -161,6 +161,7 @@ int load_multiboot(FWCfgState *fw_cfg,
|
|
|
4ec855 |
uint8_t bootinfo[MBI_SIZE];
|
|
|
4ec855 |
uint8_t *mb_bootinfo_data;
|
|
|
4ec855 |
uint32_t cmdline_len;
|
|
|
4ec855 |
+ GList *mods = NULL;
|
|
|
4ec855 |
|
|
|
4ec855 |
/* Ok, let's see if it is a multiboot image.
|
|
|
4ec855 |
The header is 12x32bit long, so the latest entry may be 8192 - 48. */
|
|
|
4ec855 |
@@ -291,15 +292,16 @@ int load_multiboot(FWCfgState *fw_cfg,
|
|
|
4ec855 |
cmdline_len = strlen(kernel_filename) + 1;
|
|
|
4ec855 |
cmdline_len += strlen(kernel_cmdline) + 1;
|
|
|
4ec855 |
if (initrd_filename) {
|
|
|
4ec855 |
- const char *r = get_opt_value(initrd_filename, NULL);
|
|
|
4ec855 |
+ const char *r = initrd_filename;
|
|
|
4ec855 |
cmdline_len += strlen(initrd_filename) + 1;
|
|
|
4ec855 |
- while (1) {
|
|
|
4ec855 |
+ while (*r) {
|
|
|
4ec855 |
+ char *value;
|
|
|
4ec855 |
+ r = get_opt_value(r, &value);
|
|
|
4ec855 |
mbs.mb_mods_avail++;
|
|
|
4ec855 |
- r = get_opt_value(r, NULL);
|
|
|
4ec855 |
- if (!*r) {
|
|
|
4ec855 |
- break;
|
|
|
4ec855 |
+ mods = g_list_append(mods, value);
|
|
|
4ec855 |
+ if (*r) {
|
|
|
4ec855 |
+ r++;
|
|
|
4ec855 |
}
|
|
|
4ec855 |
- r++;
|
|
|
4ec855 |
}
|
|
|
4ec855 |
}
|
|
|
4ec855 |
|
|
|
4ec855 |
@@ -314,20 +316,16 @@ int load_multiboot(FWCfgState *fw_cfg,
|
|
|
4ec855 |
mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE;
|
|
|
4ec855 |
mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len;
|
|
|
4ec855 |
|
|
|
4ec855 |
- if (initrd_filename) {
|
|
|
4ec855 |
- const char *next_initrd;
|
|
|
4ec855 |
- char not_last;
|
|
|
4ec855 |
- char *one_file = NULL;
|
|
|
4ec855 |
-
|
|
|
4ec855 |
+ if (mods) {
|
|
|
4ec855 |
+ GList *tmpl = mods;
|
|
|
4ec855 |
mbs.offset_mods = mbs.mb_buf_size;
|
|
|
4ec855 |
|
|
|
4ec855 |
- do {
|
|
|
4ec855 |
+ while (tmpl) {
|
|
|
4ec855 |
char *next_space;
|
|
|
4ec855 |
int mb_mod_length;
|
|
|
4ec855 |
uint32_t offs = mbs.mb_buf_size;
|
|
|
4ec855 |
+ char *one_file = tmpl->data;
|
|
|
4ec855 |
|
|
|
4ec855 |
- next_initrd = get_opt_value(initrd_filename, &one_file);
|
|
|
4ec855 |
- not_last = *next_initrd;
|
|
|
4ec855 |
/* if a space comes after the module filename, treat everything
|
|
|
4ec855 |
after that as parameters */
|
|
|
4ec855 |
hwaddr c = mb_add_cmdline(&mbs, one_file);
|
|
|
4ec855 |
@@ -352,10 +350,10 @@ int load_multiboot(FWCfgState *fw_cfg,
|
|
|
4ec855 |
mb_debug("mod_start: %p\nmod_end: %p\n cmdline: "TARGET_FMT_plx,
|
|
|
4ec855 |
(char *)mbs.mb_buf + offs,
|
|
|
4ec855 |
(char *)mbs.mb_buf + offs + mb_mod_length, c);
|
|
|
4ec855 |
- initrd_filename = next_initrd+1;
|
|
|
4ec855 |
g_free(one_file);
|
|
|
4ec855 |
- one_file = NULL;
|
|
|
4ec855 |
- } while (not_last);
|
|
|
4ec855 |
+ tmpl = tmpl->next;
|
|
|
4ec855 |
+ }
|
|
|
4ec855 |
+ g_list_free(mods);
|
|
|
4ec855 |
}
|
|
|
4ec855 |
|
|
|
4ec855 |
/* Commandline support */
|
|
|
4ec855 |
--
|
|
|
4ec855 |
1.8.3.1
|
|
|
4ec855 |
|