@@ -26,6 +26,7 @@ struct boot_module {
uint32_t flags;
#define BOOTMOD_FLAG_X86_RELOCATED (1U << 0)
+#define BOOTMOD_FLAG_X86_CONSUMED (1U << 1)
paddr_t start;
size_t size;
@@ -320,6 +320,7 @@ static void __init multiboot_to_bootinfo(multiboot_info_t *mbi, module_t *mods)
/* map the last mb module for xen entry */
boot_mods[info.nr_mods].type = BOOTMOD_XEN;
+ boot_mods[info.nr_mods].flags |= BOOTMOD_FLAG_X86_CONSUMED;
boot_mods[info.nr_mods].early_mod = &mods[info.nr_mods];
boot_info = &info;
@@ -1212,6 +1213,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
bitmap_fill(module_map, boot_info->nr_mods);
__clear_bit(0, module_map); /* Dom0 kernel is always first */
boot_info->mods[0].type = BOOTMOD_KERNEL;
+ boot_info->mods[0].flags |= BOOTMOD_FLAG_X86_CONSUMED;
if ( pvh_boot )
{
@@ -2100,6 +2102,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
initrdidx = find_first_bit(module_map, boot_info->nr_mods);
boot_info->mods[initrdidx].type = BOOTMOD_RAMDISK;
+ boot_info->mods[initrdidx].flags |= BOOTMOD_FLAG_X86_CONSUMED;
if ( bitmap_weight(module_map, boot_info->nr_mods) > 1 )
printk(XENLOG_WARNING
"Multiple initrd candidates, picking module #%u\n",
Allow the tracking of when a boot module has been consumed by a handler in the hypervisor independent of when it is claimed. The instances where the hypervisor does nothing beyond claiming, the dom0 kernel, dom0 ramdisk, and a placeholder for itself, are updated as being consumed at the time of being claimed. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- xen/arch/x86/include/asm/bootinfo.h | 1 + xen/arch/x86/setup.c | 3 +++ 2 files changed, 4 insertions(+)