[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/5] pvh: load initrd and expose it through fw_cf
From: |
Liam Merwick |
Subject: |
[Qemu-devel] [PATCH v3 5/5] pvh: load initrd and expose it through fw_cfg |
Date: |
Tue, 15 Jan 2019 12:18:07 +0000 |
From: Stefano Garzarella <address@hidden>
When initrd is specified, load and expose it to the guest firmware
through fw_cfg. The firmware will fill the hvm_start_info for the
kernel.
Signed-off-by: Stefano Garzarella <address@hidden>
Based-on: <address@hidden>
Signed-off-by: Liam Merwick <address@hidden>
---
hw/i386/pc.c | 38 +++++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 6d549950a044..9ed5063de8f8 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1213,25 +1213,45 @@ static void load_linux(PCMachineState *pcms,
*/
if (load_elfboot(kernel_filename, kernel_size,
header, pvh_start_addr, fw_cfg)) {
- struct hvm_modlist_entry ramdisk_mod = { 0 };
-
fclose(f);
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
strlen(kernel_cmdline) + 1);
fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA, kernel_cmdline);
- assert(machine->device_memory != NULL);
- ramdisk_mod.paddr = machine->device_memory->base;
- ramdisk_mod.size =
- memory_region_size(&machine->device_memory->mr);
-
- fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, &ramdisk_mod,
- sizeof(ramdisk_mod));
fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, sizeof(header));
fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA,
header, sizeof(header));
+ /* load initrd */
+ if (initrd_filename) {
+ gsize initrd_size;
+ gchar *initrd_data;
+ GError *gerr = NULL;
+
+ if (!g_file_get_contents(initrd_filename, &initrd_data,
+ &initrd_size, &gerr)) {
+ fprintf(stderr, "qemu: error reading initrd %s: %s\n",
+ initrd_filename, gerr->message);
+ exit(1);
+ }
+
+ initrd_max = pcms->below_4g_mem_size - pcmc->acpi_data_size -
1;
+ if (initrd_size >= initrd_max) {
+ fprintf(stderr, "qemu: initrd is too large, cannot
support."
+ "(max: %"PRIu32", need %"PRId64")\n",
+ initrd_max, (uint64_t)initrd_size);
+ exit(1);
+ }
+
+ initrd_addr = (initrd_max - initrd_size) & ~4095;
+
+ fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_addr);
+ fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, initrd_data,
+ initrd_size);
+ }
+
return;
}
/* This looks like a multiboot kernel. If it is, let's stop
--
1.8.3.1
- [Qemu-devel] [PATCH v3 0/4] QEMU changes to do PVH boot, Liam Merwick, 2019/01/15
- [Qemu-devel] [PATCH v3 2/5] elf-ops.h: Add get_elf_note_type(), Liam Merwick, 2019/01/15
- [Qemu-devel] [PATCH v3 3/5] pvh: Add x86/HVM direct boot ABI header file, Liam Merwick, 2019/01/15
- [Qemu-devel] [PATCH v3 1/5] elf: Add optional function ptr to load_elf() to parse ELF notes, Liam Merwick, 2019/01/15
- [Qemu-devel] [PATCH v3 4/5] pvh: Boot uncompressed kernel using direct boot ABI, Liam Merwick, 2019/01/15
- [Qemu-devel] [PATCH v3 5/5] pvh: load initrd and expose it through fw_cfg,
Liam Merwick <=
- Re: [Qemu-devel] [PATCH v3 0/4] QEMU changes to do PVH boot, Paolo Bonzini, 2019/01/15
- Re: [Qemu-devel] [PATCH v3 0/4] QEMU changes to do PVH boot, no-reply, 2019/01/20