From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkSzI-0005zh-Qi for qemu-devel@nongnu.org; Fri, 18 Jan 2019 07:11:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkSzI-0005Mb-09 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 07:11:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gkSzH-0005Lc-Nz for qemu-devel@nongnu.org; Fri, 18 Jan 2019 07:11:03 -0500 From: Stefano Garzarella Date: Fri, 18 Jan 2019 13:01:43 +0100 Message-Id: <20190118120143.21631-6-sgarzare@redhat.com> In-Reply-To: <20190118120143.21631-1-sgarzare@redhat.com> References: <20190118120143.21631-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 5/5] optionrom/pvh: load initrd from fw_cfg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Paolo Bonzini , George Kennedy , Marcel Apfelbaum , Stefan Hajnoczi , Maran Wilson , Liam Merwick , Boris Ostrovsky , Richard Henderson , Eric Blake , "Michael S. Tsirkin" 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 Reviewed-by: Stefan Hajnoczi Reviewed-by: Liam Merwick --- pc-bios/optionrom/pvh_main.c | 21 +++++++++++++++++++-- pc-bios/pvh.bin | Bin 1536 -> 1536 bytes 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pc-bios/optionrom/pvh_main.c b/pc-bios/optionrom/pvh_main.c index f355476e68..d1b8b4b96e 100644 --- a/pc-bios/optionrom/pvh_main.c +++ b/pc-bios/optionrom/pvh_main.c @@ -46,6 +46,7 @@ struct pvh_e820_table { struct pvh_e820_table pvh_e820 __attribute__ ((aligned)); =20 static struct hvm_start_info start_info; +static struct hvm_modlist_entry ramdisk_mod; static uint8_t cmdline_buffer[CMDLINE_BUFSIZE]; =20 =20 @@ -71,8 +72,8 @@ extern void pvh_load_kernel(void) asm("pvh_load_kernel"= ); void pvh_load_kernel(void) { void *cmdline_addr =3D &cmdline_buffer; - void *kernel_entry; - uint32_t cmdline_size, fw_cfg_version =3D bios_cfg_version(); + void *kernel_entry, *initrd_addr; + uint32_t cmdline_size, initrd_size, fw_cfg_version =3D bios_cfg_vers= ion(); =20 start_info.magic =3D XEN_HVM_START_MAGIC_VALUE; start_info.version =3D 1; @@ -110,6 +111,22 @@ void pvh_load_kernel(void) fw_cfg_version); start_info.cmdline_paddr =3D (uintptr_t)cmdline_addr; =20 + /* Check if we have the initrd to load */ + bios_cfg_read_entry(&initrd_size, FW_CFG_INITRD_SIZE, 4, fw_cfg_vers= ion); + 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 =3D (uintptr_t)initrd_addr; + ramdisk_mod.size =3D initrd_size; + + /* The first module is always ramdisk. */ + start_info.modlist_paddr =3D (uintptr_t)&ramdisk_mod; + start_info.nr_modules =3D 1; + } + bios_cfg_read_entry(&kernel_entry, FW_CFG_KERNEL_ENTRY, 4, fw_cfg_ve= rsion); =20 asm volatile("jmp *%1" : : "b"(&start_info), "c"(kernel_entry)); diff --git a/pc-bios/pvh.bin b/pc-bios/pvh.bin index 38a41761014957d50eb55d790b6957888cbeee0a..8033080ada2db4c4613fdc3bb= 5a69d79c7b0c0ca 100644 GIT binary patch delta 735 zcmZqRY2cYKndyM&#;Nv<`Y|dZ$5|Uh85k;#<{2MnZ2__v85kHA9sn{HZvYZIPJmb| zfW&duHKLQ5nUrMIfhw902-q@k@G+F$J|Cout)f{N^UIC!Q4iTVG=3Dc}~$y9I%~ogfvxH7Wv~w?60W5Uq#G zb^8ECzJtWNSyZ}1R9F_z0NXGJNbcZV*bKQ3xZ=3DQ(yf415}LN%^5^G8scV%O`y;R+Qji<3DDe^<^K@j Z2no&!h6hlR%ga4L7i~VsEX~MR4FFIY;aUIy delta 434 zcmZqRY2cYKnW;f!<5YV_{Sp>3=3D9kl8-R?(1wdj)2Z)sc zB#yJ@h)iZ?Qj%c@s%SnSV9UV4$549rIBNn>5(JL3rie^-WRk9*!N9`6V0pM)?4=3Dn{ zY40|WBv6CpVg5E%pg^}k~;W} z(J7;H+(iY*0P26n#NRp{$k;2u3Un37%Fb75@AnA;c{@QWdTUffIzN5R*&&(+mFxBa zirfc@b+f2+hp4bDjsV*b10;6{Ko!CC3V_t@289Gro525v%|~RS