qemu-trivial.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess
       [not found] <20170623164557.11636-1-f4bug@amsat.org>
@ 2017-06-23 16:45 ` Philippe Mathieu-Daudé
  2017-06-23 17:11   ` Peter Maydell
  2017-06-27 13:29   ` Michael Tokarev
  2017-06-23 16:45 ` [Qemu-trivial] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as() Philippe Mathieu-Daudé
  1 sibling, 2 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-06-23 16:45 UTC (permalink / raw)
  To: qemu-devel, Peter Maydell, qemu-trivial, Eric Blake,
	Peter Crosthwaite, Markus Armbruster, Laszlo Ersek,
	Michael S . Tsirkin, Gerd Hoffmann, Alexander Graf, David Gibson,
	Eduardo Habkost, Alistair Francis
  Cc: Philippe Mathieu-Daudé

fprintf(stderr) is how errors are reported in this file.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/core/loader.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/core/loader.c b/hw/core/loader.c
index f72930ca4a..094f24627f 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -478,6 +478,7 @@ int load_elf_ram(const char *filename,
     }
 
     if (target_data_order != e_ident[EI_DATA]) {
+        fprintf(stderr, "%s: wrong endianess\n", filename);
         ret = ELF_LOAD_WRONG_ENDIAN;
         goto fail;
     }
-- 
2.13.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Qemu-trivial] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as()
       [not found] <20170623164557.11636-1-f4bug@amsat.org>
  2017-06-23 16:45 ` [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess Philippe Mathieu-Daudé
@ 2017-06-23 16:45 ` Philippe Mathieu-Daudé
  2017-06-26 22:36   ` [Qemu-trivial] [Qemu-devel] " Alistair Francis
  2017-06-27 13:30   ` [Qemu-trivial] " Michael Tokarev
  1 sibling, 2 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-06-23 16:45 UTC (permalink / raw)
  To: qemu-devel, Peter Maydell, qemu-trivial, Eric Blake,
	Peter Crosthwaite, Markus Armbruster, Laszlo Ersek,
	Michael S . Tsirkin, Gerd Hoffmann, Alexander Graf, David Gibson,
	Eduardo Habkost, Alistair Francis
  Cc: Philippe Mathieu-Daudé

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/core/loader.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 094f24627f..e137e772ae 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -150,7 +150,9 @@ int load_image_targphys_as(const char *filename,
         return -1;
     }
     if (size > 0) {
-        rom_add_file_fixed_as(filename, addr, -1, as);
+        if (rom_add_file_fixed_as(filename, addr, -1, as) < 0) {
+            return -1;
+        }
     }
     return size;
 }
-- 
2.13.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess
  2017-06-23 16:45 ` [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess Philippe Mathieu-Daudé
@ 2017-06-23 17:11   ` Peter Maydell
  2017-06-27 13:29   ` Michael Tokarev
  1 sibling, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2017-06-23 17:11 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé
  Cc: QEMU Developers, QEMU Trivial, Eric Blake, Peter Crosthwaite,
	Markus Armbruster, Laszlo Ersek, Michael S . Tsirkin,
	Gerd Hoffmann, Alexander Graf, David Gibson, Eduardo Habkost,
	Alistair Francis

On 23 June 2017 at 17:45, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> fprintf(stderr) is how errors are reported in this file.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/core/loader.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index f72930ca4a..094f24627f 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -478,6 +478,7 @@ int load_elf_ram(const char *filename,
>      }
>
>      if (target_data_order != e_ident[EI_DATA]) {
> +        fprintf(stderr, "%s: wrong endianess\n", filename);

"endianness" (two 'n's).

>          ret = ELF_LOAD_WRONG_ENDIAN;
>          goto fail;
>      }
> --
> 2.13.1

thanks
-- PMM


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as()
  2017-06-23 16:45 ` [Qemu-trivial] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as() Philippe Mathieu-Daudé
@ 2017-06-26 22:36   ` Alistair Francis
  2017-06-27 13:30   ` [Qemu-trivial] " Michael Tokarev
  1 sibling, 0 replies; 6+ messages in thread
From: Alistair Francis @ 2017-06-26 22:36 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé
  Cc: qemu-devel@nongnu.org Developers, Peter Maydell, QEMU Trivial,
	Eric Blake, Peter Crosthwaite, Markus Armbruster, Laszlo Ersek,
	Michael S . Tsirkin, Gerd Hoffmann, Alexander Graf, David Gibson,
	Eduardo Habkost, Alistair Francis

On Fri, Jun 23, 2017 at 9:45 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Thanks,
Alistair

> ---
>  hw/core/loader.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 094f24627f..e137e772ae 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -150,7 +150,9 @@ int load_image_targphys_as(const char *filename,
>          return -1;
>      }
>      if (size > 0) {
> -        rom_add_file_fixed_as(filename, addr, -1, as);
> +        if (rom_add_file_fixed_as(filename, addr, -1, as) < 0) {
> +            return -1;
> +        }
>      }
>      return size;
>  }
> --
> 2.13.1
>
>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess
  2017-06-23 16:45 ` [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess Philippe Mathieu-Daudé
  2017-06-23 17:11   ` Peter Maydell
@ 2017-06-27 13:29   ` Michael Tokarev
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2017-06-27 13:29 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé, qemu-devel, Peter Maydell,
	qemu-trivial, Eric Blake, Peter Crosthwaite, Markus Armbruster,
	Laszlo Ersek, Michael S . Tsirkin, Gerd Hoffmann, Alexander Graf,
	David Gibson, Eduardo Habkost, Alistair Francis

23.06.2017 19:45, Philippe Mathieu-Daudé wrote:
> fprintf(stderr) is how errors are reported in this file.

Applied to -trivial (with typo fix), thanks!

/mjt


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-trivial] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as()
  2017-06-23 16:45 ` [Qemu-trivial] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as() Philippe Mathieu-Daudé
  2017-06-26 22:36   ` [Qemu-trivial] [Qemu-devel] " Alistair Francis
@ 2017-06-27 13:30   ` Michael Tokarev
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2017-06-27 13:30 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé, qemu-devel, Peter Maydell,
	qemu-trivial, Eric Blake, Peter Crosthwaite, Markus Armbruster,
	Laszlo Ersek, Michael S . Tsirkin, Gerd Hoffmann, Alexander Graf,
	David Gibson, Eduardo Habkost, Alistair Francis

Applied to -trivial, thanks!

/mjt


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-06-27 13:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20170623164557.11636-1-f4bug@amsat.org>
2017-06-23 16:45 ` [Qemu-trivial] [PATCH 1/3] elf-loader: warn about invalid endianess Philippe Mathieu-Daudé
2017-06-23 17:11   ` Peter Maydell
2017-06-27 13:29   ` Michael Tokarev
2017-06-23 16:45 ` [Qemu-trivial] [PATCH 2/3] hw/core: fix missing return value in load_image_targphys_as() Philippe Mathieu-Daudé
2017-06-26 22:36   ` [Qemu-trivial] [Qemu-devel] " Alistair Francis
2017-06-27 13:30   ` [Qemu-trivial] " Michael Tokarev

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).