Blame SOURCES/kvm-i386-only-parse-the-initrd_filename-once-for-multibo.patch

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