* [Qemu-devel] [PATCH] Added negative check for get_image_size()
@ 2016-04-25 15:36 Zhou Jie
2016-04-26 2:02 ` David Gibson
0 siblings, 1 reply; 2+ messages in thread
From: Zhou Jie @ 2016-04-25 15:36 UTC (permalink / raw)
To: qemu-devel; +Cc: david, qemu-trivial, Zhou Jie
This patch adds check for negative return value from get_image_size(),
where it is missing. It avoids unnecessary two function calls.
Signed-off-by: Zhou Jie <zhoujie2011@cn.fujitsu.com>
---
hw/ppc/spapr.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index feaab08..ccea633 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1842,6 +1842,10 @@ static void ppc_spapr_init(MachineState *machine)
exit(1);
}
spapr->rtas_size = get_image_size(filename);
+ if (spapr->rtas_size < 0) {
+ error_report("Could not get size of LPAR rtas '%s'", filename);
+ exit(1);
+ }
spapr->rtas_blob = g_malloc(spapr->rtas_size);
if (load_image_size(filename, spapr->rtas_blob, spapr->rtas_size) < 0) {
error_report("Could not load LPAR rtas '%s'", filename);
--
2.5.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] Added negative check for get_image_size()
2016-04-25 15:36 [Qemu-devel] [PATCH] Added negative check for get_image_size() Zhou Jie
@ 2016-04-26 2:02 ` David Gibson
0 siblings, 0 replies; 2+ messages in thread
From: David Gibson @ 2016-04-26 2:02 UTC (permalink / raw)
To: Zhou Jie; +Cc: qemu-devel, qemu-trivial
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
On Mon, Apr 25, 2016 at 11:36:06AM -0400, Zhou Jie wrote:
> This patch adds check for negative return value from get_image_size(),
> where it is missing. It avoids unnecessary two function calls.
>
> Signed-off-by: Zhou Jie <zhoujie2011@cn.fujitsu.com>
Applied to ppc-for-2.7, thanks.
> ---
> hw/ppc/spapr.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index feaab08..ccea633 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1842,6 +1842,10 @@ static void ppc_spapr_init(MachineState *machine)
> exit(1);
> }
> spapr->rtas_size = get_image_size(filename);
> + if (spapr->rtas_size < 0) {
> + error_report("Could not get size of LPAR rtas '%s'", filename);
> + exit(1);
> + }
> spapr->rtas_blob = g_malloc(spapr->rtas_size);
> if (load_image_size(filename, spapr->rtas_blob, spapr->rtas_size) < 0) {
> error_report("Could not load LPAR rtas '%s'", filename);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-26 2:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-25 15:36 [Qemu-devel] [PATCH] Added negative check for get_image_size() Zhou Jie
2016-04-26 2:02 ` David Gibson
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).