x86/boot: add cmdline_pa to struct boot_module

Add an address field, cmdline_pa, to struct boot_module to hold the address of
the string field from struct mod.

Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h
index d1508e7ad72cc3ff3e07be3667262b655a38256a..cc630563068377509183fb23edaa9ba0d5b2f613 100644 (file)
--- a/xen/arch/x86/include/asm/bootinfo.h
+++ b/xen/arch/x86/include/asm/bootinfo.h
@@ -57,6 +57,8 @@ struct boot_module {
      *   +-----------------------------------------+
      */
     unsigned long headroom;
+
+    paddr_t cmdline_pa;
 };
 
 /*

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index b4c17a1411387013d4ccefde174284141295ba50..eac8488c4ca5415354655c1809b38249433a460d 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -312,8 +312,12 @@ static struct boot_info *__init multiboot_fill_boot_info(
      * reserved for Xen.
      */
     for ( i = 0; i < MAX_NR_BOOTMODS && i < bi->nr_modules; i++ )
+    {
         bi->mods[i].mod = &mods[i];
 
+        bi->mods[i].cmdline_pa = mods[i].string;
+    }
+
     /* Variable 'i' should be one entry past the last module. */
     bi->mods[i].mod = &mods[bi->nr_modules];
     bi->mods[i].type = BOOTMOD_XEN;