On 12/2/24 04:49, Jan Beulich wrote:
On 23.11.2024 19:20, Daniel P. Smith wrote:
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -644,9 +644,11 @@ static bool __init check_and_adjust_load_address(
}
static int __init pvh_load_kernel(
- struct domain *d, struct boot_module *image, struct boot_module *initrd,
- paddr_t *entry, paddr_t *start_info_addr)
+ struct boot_domain *bd, paddr_t *entry, paddr_t *start_info_addr)
{
+ struct domain *d = bd->d;
+ struct boot_module *image = bd->kernel;
+ struct boot_module *initrd = bd->ramdisk;
void *image_base = bootstrap_map_bm(image);
void *image_start = image_base + image->headroom;
unsigned long image_len = image->size;
@@ -1304,14 +1306,12 @@ static void __hwdom_init pvh_setup_mmcfg(struct domain
*d)
int __init dom0_construct_pvh(struct boot_domain *bd)
{
paddr_t entry, start_info;
- struct boot_module *image = bd->kernel;
- struct boot_module *initrd = bd->ramdisk;
struct domain *d = bd->d;
int rc;
printk(XENLOG_INFO "*** Building a PVH Dom%d ***\n", d->domain_id);
- if ( image == NULL )
+ if ( bd->kernel == NULL )
panic("Missing kernel boot module for %pd construction\n", d);
if ( is_hardware_domain(d) )
@@ -1351,7 +1351,7 @@ int __init dom0_construct_pvh(struct boot_domain *bd)
return rc;
}
- rc = pvh_load_kernel(d, image, initrd, &entry, &start_info);
+ rc = pvh_load_kernel(bd, &entry, &start_info);
if ( rc )
{
printk("Failed to load Dom0 kernel\n");
None of this looks command line related - do these changes rather belong into
patch 1?
Hmmm, yah, it looks like it. This must have been a cherry-pick artifact
that I missed when updating these commits on top of the version from the
boot module reviews. I will review and move/drop the chunks.
v/r,
dps
