@@ -42,6 +42,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;
@@ -318,6 +318,7 @@ static struct boot_info *__init multiboot_fill_boot_info(unsigned long mbi_p)
/* map the last mb module for xen entry */
bi->mods[bi->nr_modules].type = BOOTMOD_XEN;
+ bi->mods[bi->nr_modules].flags = BOOTMOD_FLAG_X86_CONSUMED;
return bi;
}
@@ -1180,6 +1181,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
bitmap_fill(module_map, bi->nr_modules);
__clear_bit(0, module_map); /* Dom0 kernel is always first */
bi->mods[0].type = BOOTMOD_KERNEL;
+ bi->mods[0].flags = BOOTMOD_FLAG_X86_CONSUMED;
if ( pvh_boot )
{
@@ -2068,7 +2070,10 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
initrdidx = find_first_bit(module_map, bi->nr_modules);
if ( initrdidx < bi->nr_modules )
+ {
bi->mods[initrdidx].type = BOOTMOD_RAMDISK;
+ bi->mods[initrdidx].flags |= BOOTMOD_FLAG_X86_CONSUMED;
+ }
if ( bitmap_weight(module_map, bi->nr_modules) > 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> --- Changes since v5: - first flag assignment can be = instead of |= --- xen/arch/x86/include/asm/bootinfo.h | 1 + xen/arch/x86/setup.c | 5 +++++ 2 files changed, 6 insertions(+)