From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUMGd-0003OY-Cl for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:19:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUMGX-0001Kf-Rz for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:19:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44195 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUMGX-0001KK-M0 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:19:05 -0400 From: Alexander Graf Date: Mon, 22 Apr 2013 21:18:08 +0200 Message-Id: <1366658298-9275-3-git-send-email-agraf@suse.de> In-Reply-To: <1366658298-9275-1-git-send-email-agraf@suse.de> References: <1366658298-9275-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 02/12] S390: IPL: Support ELF firmware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Christian Borntraeger , Dominik Dingel Our firmware blob is always a raw file that we load at a fixed address today. Support loading an ELF blob instead that we can map high up in memory. This way we don't have to be so conscious about size constraints. Signed-off-by: Alexander Graf --- hw/s390x/ipl.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index c43dfcd..d1f7acd 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -82,17 +82,21 @@ static int s390_ipl_init(SysBusDevice *dev) } bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, 4096); - ipl->start_addr = ZIPL_IMAGE_START; + bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL, + NULL, 1, ELF_MACHINE, 0); + if (bios_size == -1UL) { + bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, + 4096); + ipl->start_addr = ZIPL_IMAGE_START; + if (bios_size > 4096) { + hw_error("stage1 bootloader is > 4k\n"); + } + } g_free(bios_filename); if ((long)bios_size < 0) { hw_error("could not load bootloader '%s'\n", bios_name); } - - if (bios_size > 4096) { - hw_error("stage1 bootloader is > 4k\n"); - } return 0; } else { kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL, NULL, -- 1.6.0.2