@@ -40,6 +40,12 @@ struct boot_module {
*/
unsigned long headroom;
enum bootmod_type type;
+
+ /*
+ * Module State Flags:
+ * relocated: indicates module has been relocated in memory.
+ */
+ bool relocated:1;
};
/*
@@ -1378,7 +1378,6 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
panic("Bootloader didn't honor module alignment request\n");
bi->mods[i].mod->mod_end -= bi->mods[i].mod->mod_start;
bi->mods[i].mod->mod_start >>= PAGE_SHIFT;
- bi->mods[i].mod->reserved = 0;
}
/*
@@ -1492,7 +1491,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
struct boot_module *bm = &bi->mods[j];
unsigned long size = PAGE_ALIGN(bm->headroom + bm->mod->mod_end);
- if ( bm->mod->reserved )
+ if ( bm->relocated )
continue;
/* Don't overlap with other modules (or Xen itself). */
@@ -1511,7 +1510,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
bm->mod->mod_end);
bm->mod->mod_start = (end - size) >> PAGE_SHIFT;
bm->mod->mod_end += bm->headroom;
- bm->mod->reserved = 1;
+ bm->relocated = true;
}
}
@@ -1537,7 +1536,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
#endif
}
- if ( bi->mods[0].headroom && !bi->mods[0].mod->reserved )
+ if ( bi->mods[0].headroom && !bi->mods[0].relocated )
panic("Not enough memory to relocate the dom0 kernel image\n");
for ( i = 0; i < bi->nr_modules; ++i )
{
The existing startup code employs various ad-hoc state tracking about certain boot module types by each area of the code. A boot module flags bitfield is added to enable tracking these different states. The first state to be transition by this commit is module relocation. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- Changes since v6: - replaced bitmask flags field with the bitfield, relocated - slight update to commit message to mention bitfield - dropped Rb and Ab due to approach change Changes since v5: - removed trailing blank line. --- xen/arch/x86/include/asm/bootinfo.h | 6 ++++++ xen/arch/x86/setup.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-)