From patchwork Fri Apr 26 12:12:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Dingel X-Patchwork-Id: 239836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 852912C010B for ; Fri, 26 Apr 2013 22:15:05 +1000 (EST) Received: from localhost ([::1]:41427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVhYN-0005kG-Lj for incoming@patchwork.ozlabs.org; Fri, 26 Apr 2013 08:15:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVhWj-0003SE-FD for qemu-devel@nongnu.org; Fri, 26 Apr 2013 08:13:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVhWd-0002G7-CW for qemu-devel@nongnu.org; Fri, 26 Apr 2013 08:13:21 -0400 Received: from e06smtp18.uk.ibm.com ([195.75.94.114]:45891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVhWd-0002Fu-2d for qemu-devel@nongnu.org; Fri, 26 Apr 2013 08:13:15 -0400 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Apr 2013 13:09:25 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Apr 2013 13:09:25 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7FCB017D8018 for ; Fri, 26 Apr 2013 13:14:02 +0100 (BST) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3QCCrkR41943042 for ; Fri, 26 Apr 2013 12:12:53 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3QCD2sP028926 for ; Fri, 26 Apr 2013 06:13:02 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3QCD20k028920; Fri, 26 Apr 2013 06:13:02 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 2944) id 46E26122442E; Fri, 26 Apr 2013 14:13:02 +0200 (CEST) From: Dominik Dingel To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2013 14:12:51 +0200 Message-Id: <1366978377-16823-5-git-send-email-dingel@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1366978377-16823-1-git-send-email-dingel@linux.vnet.ibm.com> References: <1366978377-16823-1-git-send-email-dingel@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13042612-6892-0000-0000-000004F74CF1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.114 Cc: Christian Borntraeger , Alexander Graf , Dominik Dingel Subject: [Qemu-devel] [PATCH 04/10] S390: check if BIOS is available and create links X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Dominik Dingel Check if the BIOS is available before loading it into the memory. Create the needed Links for build. Add a if the BIOS is available, also add the needed links for the build process. diff --git a/configure b/configure index 19777de..2bbbd54 100755 --- a/configure +++ b/configure @@ -4541,6 +4541,7 @@ for bios_file in \ $source_path/pc-bios/*.aml \ $source_path/pc-bios/*.rom \ $source_path/pc-bios/*.dtb \ + $source_path/pc-bios/*.img \ $source_path/pc-bios/openbios-* \ $source_path/pc-bios/palcode-* do diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 9758529..36daa67 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -95,6 +95,10 @@ static int s390_ipl_init(SysBusDevice *dev) } bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (bios_filename == NULL) { + hw_error("could not find stage1 bootloader\n"); + } + bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL, NULL, 1, ELF_MACHINE, 0); if (bios_size == -1UL) { diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index ad55a14..1e6ab1e 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -21,6 +21,7 @@ s390-ccw.elf: $(OBJECTS) s390-ccw.img: s390-ccw.elf $(call quiet-command,strip $< -o $@," Stripping $(TARGET_DIR)$@") + ln -s -f `pwd`/$@ ../$@ clean: rm -f *.o *.d *.img *.elf *~