From patchwork Thu Mar 12 12:53:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 449457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E21AB140083 for ; Thu, 12 Mar 2015 23:55:12 +1100 (AEDT) Received: from localhost ([::1]:59801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW2dr-0005Be-2J for incoming@patchwork.ozlabs.org; Thu, 12 Mar 2015 08:55:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW2d8-0003sv-2C for qemu-devel@nongnu.org; Thu, 12 Mar 2015 08:54:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YW2cv-0002q3-Kq for qemu-devel@nongnu.org; Thu, 12 Mar 2015 08:54:26 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:53483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW2cv-0002oo-AX for qemu-devel@nongnu.org; Thu, 12 Mar 2015 08:54:13 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Mar 2015 12:54:10 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Mar 2015 12:54:04 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 859DC1B0804B for ; Thu, 12 Mar 2015 12:54:25 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2CCs4B863111336 for ; Thu, 12 Mar 2015 12:54:04 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2CCs28i005751 for ; Thu, 12 Mar 2015 06:54:04 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t2CCs1eQ005688; Thu, 12 Mar 2015 06:54:01 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id D041A1224459; Thu, 12 Mar 2015 13:54:01 +0100 (CET) From: Jens Freimann To: Christian Borntraeger , Alexander Graf , Cornelia Huck Date: Thu, 12 Mar 2015 13:53:53 +0100 Message-Id: <1426164834-38648-6-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1426164834-38648-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1426164834-38648-1-git-send-email-jfrei@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15031212-0017-0000-0000-000003599BC9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.110 Cc: Jens Freimann , qemu-devel@nongnu.org, Dominik Dingel Subject: [Qemu-devel] [PATCH 5/6] s390x/ipl: remove dead code 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 From: Dominik Dingel load_image_targphys already checks the max size and will return an error code. So the follow-on check will never trigger. Signed-off-by: Dominik Dingel Reviewed-by: Cornelia Huck Reviewed-by: Thomas Huth Signed-off-by: Jens Freimann --- hw/s390x/ipl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index b57adbd..521dd94 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -124,9 +124,6 @@ static int s390_ipl_init(SysBusDevice *dev) bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, 4096); ipl->bios_start_addr = ZIPL_IMAGE_START; - if (bios_size > 4096) { - hw_error("stage1 bootloader is > 4k\n"); - } } g_free(bios_filename);