Re: [Xen-devel] [PATCH 1/3] libxc: Cleanup xc_dom_parse_elf_kernel()'s return value

[Roger Pau Monné]

On Thu, Feb 08, 2018 at 10:49:08PM +0100, Simon Gaiser wrote:
> xc_dom_loader.parser() should return elf_negerrnoval.
> 
> Signed-off-by: Simon Gaiser 

LGTM:

Reviewed-by: Roger Pau Monné 

Thanks.

___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH 1/3] libxc: Cleanup xc_dom_parse_elf_kernel()'s return value

[Simon Gaiser]

xc_dom_loader.parser() should return elf_negerrnoval.

Signed-off-by: Simon Gaiser 
---
 tools/libxc/xc_dom_elfloader.c | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c
index 568d7f370c..c936f92a66 100644
--- a/tools/libxc/xc_dom_elfloader.c
+++ b/tools/libxc/xc_dom_elfloader.c
@@ -140,14 +140,10 @@ static elf_negerrnoval xc_dom_probe_elf_kernel(struct 
xc_dom_image *dom)
 return 0;
 }
 
-static elf_errorstatus xc_dom_parse_elf_kernel(struct xc_dom_image *dom)
-/*
- * This function sometimes returns -1 for error and sometimes
- * an errno value.  ?!?!
- */
+static elf_negerrnoval xc_dom_parse_elf_kernel(struct xc_dom_image *dom)
 {
 struct elf_binary *elf;
-elf_errorstatus rc;
+elf_negerrnoval rc;
 
 rc = check_elf_kernel(dom, 1);
 if ( rc != 0 )
@@ -155,9 +151,9 @@ static elf_errorstatus xc_dom_parse_elf_kernel(struct 
xc_dom_image *dom)
 
 elf = xc_dom_malloc(dom, sizeof(*elf));
 if ( elf == NULL )
-return -1;
+return -ENOMEM;
 dom->private_loader = elf;
-rc = elf_init(elf, dom->kernel_blob, dom->kernel_size);
+rc = elf_init(elf, dom->kernel_blob, dom->kernel_size) != 0 ? -EINVAL : 0;
 xc_elf_set_logfile(dom->xch, elf, 1);
 if ( rc != 0 )
 {
@@ -177,8 +173,9 @@ static elf_errorstatus xc_dom_parse_elf_kernel(struct 
xc_dom_image *dom)
 
 /* parse binary and get xen meta info */
 elf_parse_binary(elf);
-if ( (rc = elf_xen_parse(elf, >parms)) != 0 )
+if ( elf_xen_parse(elf, >parms) != 0 )
 {
+rc = -EINVAL;
 goto out;
 }
 
-- 
2.15.1


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel