From patchwork Fri Feb 22 04:15:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 222463 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 4D4822C0299 for ; Fri, 22 Feb 2013 15:35:54 +1100 (EST) Received: from localhost ([::1]:41009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8k3P-00087j-Go for incoming@patchwork.ozlabs.org; Thu, 21 Feb 2013 23:16:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8k2z-00074U-C3 for qemu-devel@nongnu.org; Thu, 21 Feb 2013 23:15:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8k2w-0005XH-Ln for qemu-devel@nongnu.org; Thu, 21 Feb 2013 23:15:45 -0500 Received: from [222.73.24.84] (port=64059 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8k2v-0005WN-Pr for qemu-devel@nongnu.org; Thu, 21 Feb 2013 23:15:42 -0500 X-IronPort-AV: E=Sophos;i="4.84,713,1355068800"; d="scan'208";a="6747019" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 22 Feb 2013 12:13:22 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r1M4FMrJ017379 for ; Fri, 22 Feb 2013 12:15:40 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.225.128]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013022212143551-334892 ; Fri, 22 Feb 2013 12:14:35 +0800 From: liguang To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2013 12:15:32 +0800 Message-Id: <1361506533-28463-6-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1361506533-28463-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1361506533-28463-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/22 12:14:35, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/22 12:14:58, Serialize complete at 2013/02/22 12:14:58 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH v2 5/6] load_linux: report open kernel file & its size error 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: liguang --- hw/pc.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index fd3a68c..30b3262 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -652,12 +652,22 @@ static void load_linux(void *fw_cfg, char *vmode; /* Align to 16 bytes as a paranoia measure */ - cmdline_size = (strlen(kernel_cmdline)+16) & ~15; + cmdline_size = QEMU_ALIGN_UP(strlen(kernel_cmdline), 16); /* load the kernel header */ f = fopen(kernel_filename, "rb"); - if (!f || !(kernel_size = get_file_size(f)) || - fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) != + if (!f) { + fprintf(stderr, "can't open kernel image file: %s\n", + strerror(errno)); + exit(1); + } + kernel_size = get_file_size(f); + if (kernel_size <= 0) { + fprintf(stderr, "can't get size of kernel image file: %s\n", + strerror(errno)); + exit(1); + } + if (fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) != MIN(ARRAY_SIZE(header), kernel_size)) { fprintf(stderr, "qemu: could not load kernel '%s': %s\n", kernel_filename, strerror(errno));