mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optionrom/pvh: load initrd from fw_cfg

Browse Source 
If we found initrd through fw_cfg, we can load it and use the
first module of hvm_start_info to pass initrd address and size
to the kernel.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Based-on: <1547554687-12687-1-git-send-email-liam.merwick@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefano Garzarella 2019-01-18 13:01:43 +01:00 committed by Paolo Bonzini
parent 1fb0d70990
commit b1b876ca70
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pc-bios/optionrom/pvh_main.c
View File

@ -46,6 +46,7 @@ struct pvh_e820_table {
struct pvh_e820_table pvh_e820 asm("pvh_e820") __attribute__ ((aligned)); struct pvh_e820_table pvh_e820 asm("pvh_e820") __attribute__ ((aligned));
static struct hvm_start_info start_info; static struct hvm_start_info start_info;
static struct hvm_modlist_entry ramdisk_mod;
static uint8_t cmdline_buffer[CMDLINE_BUFSIZE]; static uint8_t cmdline_buffer[CMDLINE_BUFSIZE];
@ -71,8 +72,8 @@ extern void pvh_load_kernel(void) asm("pvh_load_kernel");
void pvh_load_kernel(void) void pvh_load_kernel(void)
{ {
void *cmdline_addr = &cmdline_buffer; void *cmdline_addr = &cmdline_buffer;
void *kernel_entry; void *kernel_entry, *initrd_addr;
uint32_t cmdline_size, fw_cfg_version = bios_cfg_version(); uint32_t cmdline_size, initrd_size, fw_cfg_version = bios_cfg_version();
start_info.magic = XEN_HVM_START_MAGIC_VALUE; start_info.magic = XEN_HVM_START_MAGIC_VALUE;
start_info.version = 1; start_info.version = 1;
@ -110,6 +111,22 @@ void pvh_load_kernel(void)
fw_cfg_version); fw_cfg_version);
start_info.cmdline_paddr = (uintptr_t)cmdline_addr; start_info.cmdline_paddr = (uintptr_t)cmdline_addr;
/* Check if we have the initrd to load */
bios_cfg_read_entry(&initrd_size, FW_CFG_INITRD_SIZE, 4, fw_cfg_version);
if (initrd_size) {
bios_cfg_read_entry(&initrd_addr, FW_CFG_INITRD_ADDR, 4,
fw_cfg_version);
bios_cfg_read_entry(initrd_addr, FW_CFG_INITRD_DATA, initrd_size,
fw_cfg_version);
ramdisk_mod.paddr = (uintptr_t)initrd_addr;
ramdisk_mod.size = initrd_size;
/* The first module is always ramdisk. */
start_info.modlist_paddr = (uintptr_t)&ramdisk_mod;
start_info.nr_modules = 1;
}
bios_cfg_read_entry(&kernel_entry, FW_CFG_KERNEL_ENTRY, 4, fw_cfg_version); bios_cfg_read_entry(&kernel_entry, FW_CFG_KERNEL_ENTRY, 4, fw_cfg_version);
asm volatile("jmp *%1" : : "b"(&start_info), "c"(kernel_entry)); asm volatile("jmp *%1" : : "b"(&start_info), "c"(kernel_entry));

BIN
pc-bios/pvh.bin
View File

Binary file not shown.