@@ -13,6 +13,7 @@
#include <xen/softirq.h>
#include <asm/amd.h>
+#include <asm/bootinfo.h>
#include <asm/dom0_build.h>
#include <asm/guest.h>
#include <asm/hpet.h>
@@ -596,9 +597,8 @@ int __init dom0_setup_permissions(struct domain *d)
return rc;
}
-int __init construct_dom0(struct domain *d, const module_t *image,
- unsigned long image_headroom, module_t *initrd,
- const char *cmdline)
+int __init construct_dom0(struct domain *d, const struct boot_module *image,
+ struct boot_module *initrd, const char *cmdline)
{
int rc;
@@ -610,9 +610,11 @@ int __init construct_dom0(struct domain *d, const module_t *image,
process_pending_softirqs();
if ( is_hvm_domain(d) )
- rc = dom0_construct_pvh(d, image, image_headroom, initrd, cmdline);
+ rc = dom0_construct_pvh(d, image->mod, image->headroom, initrd->mod,
+ cmdline);
else if ( is_pv_domain(d) )
- rc = dom0_construct_pv(d, image, image_headroom, initrd, cmdline);
+ rc = dom0_construct_pv(d, image->mod, image->headroom, initrd->mod,
+ cmdline);
else
panic("Cannot construct Dom0. No guest interface available\n");
@@ -27,10 +27,8 @@ void subarch_init_memory(void);
void init_IRQ(void);
int construct_dom0(
- struct domain *d,
- const module_t *image, unsigned long image_headroom,
- module_t *initrd,
- const char *cmdline);
+ struct domain *d, const struct boot_module *image,
+ struct boot_module *initrd, const char *cmdline);
void setup_io_bitmap(struct domain *d);
extern struct boot_info xen_boot_info;
@@ -946,7 +946,7 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li
return n;
}
-static struct domain *__init create_dom0(const struct boot_info *bi,
+static struct domain *__init create_dom0(struct boot_info *bi,
const char *kextra)
{
static char __initdata cmdline[MAX_GUEST_CMDLINE];
@@ -962,20 +962,19 @@ static struct domain *__init create_dom0(const struct boot_info *bi,
.misc_flags = opt_dom0_msr_relaxed ? XEN_X86_MSR_RELAXED : 0,
},
};
- int headroom, mod_idx = first_boot_module_index(bi, BOOTMOD_RAMDISK);
- module_t *image, *initrd;
+ int mod_idx = first_boot_module_index(bi, BOOTMOD_RAMDISK);
+ struct boot_module *image, *initrd;
struct domain *d;
domid_t domid;
/* Map boot_module to mb1 module for dom0 */
- image = bi->mods[0].mod;
- headroom = bi->mods[0].headroom;
+ image = &bi->mods[0];
/* Map boot_module to mb1 module for initrd */
if ( mod_idx < 0 )
initrd = NULL;
else
- initrd = bi->mods[mod_idx].mod;
+ initrd = &bi->mods[mod_idx];
if ( opt_dom0_pvh )
{
@@ -1002,10 +1001,11 @@ static struct domain *__init create_dom0(const struct boot_info *bi,
panic("Error creating d%uv0\n", domid);
/* Grab the DOM0 command line. */
- if ( image->string || kextra )
+ if ( image->mod->string || kextra )
{
- if ( image->string )
- safe_strcpy(cmdline, cmdline_cook(__va(image->string), bi->loader));
+ if ( image->mod->string )
+ safe_strcpy(cmdline, cmdline_cook(__va(image->mod->string),
+ bi->loader));
if ( kextra )
/* kextra always includes exactly one leading space. */
@@ -1028,7 +1028,7 @@ static struct domain *__init create_dom0(const struct boot_info *bi,
}
}
- if ( construct_dom0(d, image, headroom, initrd, cmdline) != 0 )
+ if ( construct_dom0(d, image, initrd, cmdline) != 0 )
panic("Could not construct domain 0\n");
return d;
The construct_dom0 function is converted to consume struct boot_module instances for the kernel and ramdisk. With this change, it is no longer necessary for the internal use of struct mod by create_dom0, so they are changed to struct boot_module. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- xen/arch/x86/dom0_build.c | 12 +++++++----- xen/arch/x86/include/asm/setup.h | 6 ++---- xen/arch/x86/setup.c | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-)