From patchwork Mon Nov 12 07:45:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhijian X-Patchwork-Id: 10678223 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 21FA115A6 for ; Mon, 12 Nov 2018 06:58:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11D7429FA9 for ; Mon, 12 Nov 2018 06:58:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0607029FAE; Mon, 12 Nov 2018 06:58:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FD1329FA9 for ; Mon, 12 Nov 2018 06:58:01 +0000 (UTC) Received: from localhost ([::1]:45046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gM6Aa-0003Al-8i for patchwork-qemu-devel@patchwork.kernel.org; Mon, 12 Nov 2018 01:58:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gM699-0000m0-Tf for qemu-devel@nongnu.org; Mon, 12 Nov 2018 01:56:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gM68G-00064R-MI for qemu-devel@nongnu.org; Mon, 12 Nov 2018 01:55:42 -0500 Received: from mga18.intel.com ([134.134.136.126]:61489) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gM68G-0005ou-06 for qemu-devel@nongnu.org; Mon, 12 Nov 2018 01:55:36 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Nov 2018 22:55:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,494,1534834800"; d="scan'208";a="107825913" Received: from mke-mobl.ccr.corp.intel.com (HELO haswell-OptiPlex-9020.ccr.corp.intel.com) ([10.255.30.228]) by orsmga002.jf.intel.com with ESMTP; 11 Nov 2018 22:54:59 -0800 From: Li Zhijian To: qemu-devel@nongnu.org Date: Mon, 12 Nov 2018 15:45:29 +0800 Message-Id: <1542008730-6375-2-git-send-email-lizhijian@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542008730-6375-1-git-send-email-lizhijian@cn.fujitsu.com> References: <1542008730-6375-1-git-send-email-lizhijian@cn.fujitsu.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 2/3] change load_image() reture type to ssize_t X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philip.li@intel.com, zhijianx.li@intel.com, Li Zhijian Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch allow load_iamge to load >=2G file Signed-off-by: Li Zhijian --- hw/core/loader.c | 5 +++-- include/hw/loader.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index aa0b3fc..0d53229 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -75,9 +75,10 @@ int64_t get_image_size(const char *filename) /* return the size or -1 if error */ /* deprecated, because caller does not specify buffer size! */ -int load_image(const char *filename, uint8_t *addr) +ssize_t load_image(const char *filename, uint8_t *addr) { - int fd, size; + int fd; + ssize_t size; fd = open(filename, O_RDONLY | O_BINARY); if (fd < 0) return -1; diff --git a/include/hw/loader.h b/include/hw/loader.h index 67a0af8..49bb189 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -11,7 +11,7 @@ * On error, errno is also set as appropriate. */ int64_t get_image_size(const char *filename); -int load_image(const char *filename, uint8_t *addr); /* deprecated */ +ssize_t load_image(const char *filename, uint8_t *addr); /* deprecated */ ssize_t load_image_size(const char *filename, void *addr, size_t size); /**load_image_targphys_as: