From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:35203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggSDw-0002Bg-Nm for qemu-devel@nongnu.org; Mon, 07 Jan 2019 05:33:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggSDp-0003Uz-Be for qemu-devel@nongnu.org; Mon, 07 Jan 2019 05:33:33 -0500 Received: from mail-oi1-f194.google.com ([209.85.167.194]:35142) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggSDh-0003Rx-1s for qemu-devel@nongnu.org; Mon, 07 Jan 2019 05:33:23 -0500 Received: by mail-oi1-f194.google.com with SMTP id v6so35477215oif.2 for ; Mon, 07 Jan 2019 02:33:20 -0800 (PST) MIME-Version: 1.0 References: <1544063533-10139-1-git-send-email-lizhijian@cn.fujitsu.com> <1544063533-10139-3-git-send-email-lizhijian@cn.fujitsu.com> <20181221111136-mutt-send-email-mst@kernel.org> In-Reply-To: From: Stefano Garzarella Date: Mon, 7 Jan 2019 11:33:08 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-4.0 v4 2/4] refactor load_image_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Li Zhijian Cc: "Michael S. Tsirkin" , Peter Maydell , zhijianx.li@intel.com, Philippe Mathieu Daude , qemu-devel@nongnu.org, philip.li@intel.com On Mon, Dec 24, 2018 at 3:16 AM Li Zhijian wrote= : > > > On 12/22/18 00:12, Michael S. Tsirkin wrote: > > On Thu, Dec 06, 2018 at 10:32:11AM +0800, Li Zhijian wrote: > >> Don't expect read(2) can always read as many as it's told. > >> > >> Signed-off-by: Li Zhijian > >> Reviewed-by: Richard Henderson > > This is more a theoretical bugfix than a refactoring right? > > Yes=EF=BC=8C it does. > > how about change the title to : "enhance reading on load_image_size()" or= such Maybe something like this: "hw/core/loader.c: Read as long as possible in load_image_size()" Reviewed-by: Stefano Garzarella > > Thanks > Zhijian > > > > > >> --- > >> V4: add reviewed-by tag > >> --- > >> hw/core/loader.c | 11 +++++------ > >> 1 file changed, 5 insertions(+), 6 deletions(-) > >> > >> diff --git a/hw/core/loader.c b/hw/core/loader.c > >> index fa41842..9cbceab 100644 > >> --- a/hw/core/loader.c > >> +++ b/hw/core/loader.c > >> @@ -77,21 +77,20 @@ int64_t get_image_size(const char *filename) > >> ssize_t load_image_size(const char *filename, void *addr, size_t siz= e) > >> { > >> int fd; > >> - ssize_t actsize; > >> + ssize_t actsize, l =3D 0; > >> > >> fd =3D open(filename, O_RDONLY | O_BINARY); > >> if (fd < 0) { > >> return -1; > >> } > >> > >> - actsize =3D read(fd, addr, size); > >> - if (actsize < 0) { > >> - close(fd); > >> - return -1; > >> + while ((actsize =3D read(fd, addr + l, size - l)) > 0) { > >> + l +=3D actsize; > >> } > >> + > >> close(fd); > >> > >> - return actsize; > >> + return actsize < 0 ? -1 : l; > >> } > >> > >> /* read()-like version */ > >> -- > >> 2.7.4 > > > > > > > -- > Best regards. > Li Zhijian (8528) > > > --=20 Stefano Garzarella Red Hat