qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: patches@linaro.org, Stefan Hajnoczi <stefanha@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	Li Zhijian <lizhijian@cn.fujitsu.com>,
	Philip Li <philip.li@intel.com>,
	Peter Crosthwaite <crosthwaite.peter@gmail.com>,
	Alexander Graf <agraf@suse.de>, Kevin Wolf <kwolf@redhat.com>,
	Max Reitz <mreitz@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	David Gibson <david@gibson.dropbear.id.au>,
	Igor Mammedov <imammedo@redhat.com>,
	qemu-block@nongnu.org, qemu-ppc@nongnu.org
Subject: [Qemu-devel] [PATCH 07/10] hw/block/tc58128.c: Don't use load_image()
Date: Fri, 30 Nov 2018 15:17:09 +0000	[thread overview]
Message-ID: <20181130151712.2312-8-peter.maydell@linaro.org> (raw)
In-Reply-To: <20181130151712.2312-1-peter.maydell@linaro.org>

The load_image() function is deprecated, as it does not let the
caller specify how large the buffer to read the file into is.
Instead use load_image_size().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/block/tc58128.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 808ad76ba60..d0fae248dcc 100644
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -38,7 +38,8 @@ static void init_dev(tc58128_dev * dev, const char *filename)
     memset(dev->flash_contents, 0xff, FLASH_SIZE);
     if (filename) {
 	/* Load flash image skipping the first block */
-	ret = load_image(filename, dev->flash_contents + 528 * 32);
+        ret = load_image_size(filename, dev->flash_contents + 528 * 32,
+                              FLASH_SIZE - 528 * 32);
 	if (ret < 0) {
             if (!qtest_enabled()) {
                 error_report("Could not load flash image %s", filename);
-- 
2.19.1

  parent reply	other threads:[~2018-11-30 15:17 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-30 15:17 [Qemu-devel] [PATCH 00/10] Remove deprecated load_image() function Peter Maydell
2018-11-30 15:17 ` [Qemu-devel] [PATCH 01/10] hw/ppc/mac_newworld, mac_oldworld: Don't use load_image() Peter Maydell
2018-11-30 20:08   ` Eric Blake
2018-12-02  8:54   ` David Gibson
2018-11-30 15:17 ` [Qemu-devel] [PATCH 02/10] hw/ppc/ppc405_boards: " Peter Maydell
2018-11-30 20:20   ` Eric Blake
2018-12-02  8:55   ` David Gibson
2018-11-30 15:17 ` [Qemu-devel] [PATCH 03/10] hw/smbios/smbios.c: " Peter Maydell
2018-11-30 20:21   ` Eric Blake
2018-11-30 15:17 ` [Qemu-devel] [PATCH 04/10] hw/pci/pci.c: " Peter Maydell
2018-11-30 20:22   ` Eric Blake
2018-11-30 15:17 ` [Qemu-devel] [PATCH 05/10] hw/i386/pc.c: " Peter Maydell
2018-11-30 20:26   ` Eric Blake
2018-12-01 11:52   ` Peter Maydell
2018-11-30 15:17 ` [Qemu-devel] [PATCH 06/10] hw/i386/multiboot.c: " Peter Maydell
2018-11-30 20:28   ` Eric Blake
2018-11-30 15:17 ` Peter Maydell [this message]
2018-11-30 20:30   ` [Qemu-devel] [PATCH 07/10] hw/block/tc58128.c: " Eric Blake
2018-11-30 15:17 ` [Qemu-devel] [PATCH 08/10] device_tree.c: " Peter Maydell
2018-11-30 20:31   ` Eric Blake
2018-11-30 15:17 ` [Qemu-devel] [PATCH 09/10] hw/core/loader.c: Remove load_image() Peter Maydell
2018-11-30 20:32   ` Eric Blake
2018-11-30 15:17 ` [Qemu-devel] [PATCH 10/10] include/hw/loader.h: Document load_image_size() Peter Maydell
2018-11-30 20:33   ` Eric Blake
2018-12-01  3:25 ` [Qemu-devel] [PATCH 00/10] Remove deprecated load_image() function no-reply
2018-12-03 15:45 ` Richard Henderson
2018-12-05 13:45 ` Stefan Hajnoczi
2018-12-05 13:58 ` Michael S. Tsirkin
2018-12-14 11:30 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181130151712.2312-8-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=agraf@suse.de \
    --cc=berrange@redhat.com \
    --cc=crosthwaite.peter@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=eblake@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lizhijian@cn.fujitsu.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mreitz@redhat.com \
    --cc=mst@redhat.com \
    --cc=patches@linaro.org \
    --cc=philip.li@intel.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).