From: Liam Merwick <liam.merwick@oracle.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, ehabkost@redhat.com, rth@twiddle.net,
xen-devel@lists.xenproject.org, sgarzare@redhat.com,
mst@redhat.com, stefanha@redhat.com, maran.wilson@oracle.com,
george.kennedy@oracle.com, boris.ostrovsky@oracle.com,
liam.merwick@oracle.com
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 [thread overview]
Message-ID: <1547554687-12687-6-git-send-email-liam.merwick@oracle.com> (raw)
In-Reply-To: <1547554687-12687-1-git-send-email-liam.merwick@oracle.com>
From: Stefano Garzarella <sgarzare@redhat.com>
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 <sgarzare@redhat.com>
Based-on: <1545422632-24444-5-git-send-email-liam.merwick@oracle.com>
Signed-off-by: Liam Merwick <Liam.Merwick@oracle.com>
---
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
next prev parent reply other threads:[~2019-01-15 12:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-15 12:18 [Qemu-devel] [PATCH v3 0/4] QEMU changes to do PVH boot Liam Merwick
2019-01-15 12:18 ` [Qemu-devel] [PATCH v3 1/5] elf: Add optional function ptr to load_elf() to parse ELF notes Liam Merwick
2019-01-15 18:14 ` BALATON Zoltan
2019-01-15 12:18 ` [Qemu-devel] [PATCH v3 2/5] elf-ops.h: Add get_elf_note_type() Liam Merwick
2019-01-15 12:18 ` [Qemu-devel] [PATCH v3 3/5] pvh: Add x86/HVM direct boot ABI header file Liam Merwick
2019-01-15 12:18 ` [Qemu-devel] [PATCH v3 4/5] pvh: Boot uncompressed kernel using direct boot ABI Liam Merwick
2019-01-15 12:18 ` Liam Merwick [this message]
2019-01-15 23:09 ` [Qemu-devel] [PATCH v3 0/4] QEMU changes to do PVH boot Paolo Bonzini
2019-01-21 2:31 ` no-reply
2019-01-21 8:19 ` Liam Merwick
2019-01-21 10:54 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1547554687-12687-6-git-send-email-liam.merwick@oracle.com \
--to=liam.merwick@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=ehabkost@redhat.com \
--cc=george.kennedy@oracle.com \
--cc=maran.wilson@oracle.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).