[PATCH] qemu-traditional: fix no-return-in-nonvoid-function

[PATCH] qemu-traditional: fix no-return-in-nonvoid-function

[Olaf Hering]

rpm post-build-checks found a few issues in qemu-xen-traditional and
marks them as errors.

I: Program returns random data in a function
E: xen no-return-in-nonvoid-function savevm.c:215
E: xen no-return-in-nonvoid-function /usr/src/packages/BUILD/xen-4.2.25602/non-dbg/stubdom/ioemu/xenfbfront.c:361

Signed-off-by: Olaf Hering <olaf@aepfle.de>

---
 qemu-xen.h   |    2 +-
 savevm.c     |    2 +-
 xenfbfront.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: qemu-xen-traditional-dir-remote/qemu-xen.h
===================================================================
--- qemu-xen-traditional-dir-remote.orig/qemu-xen.h
+++ qemu-xen-traditional-dir-remote/qemu-xen.h
@@ -129,7 +129,7 @@ int xenstore_find_device(BlockDriverStat
 
 /* xenfbfront.c */
 int xenfb_pv_display_init(DisplayState *ds);
-int xenfb_pv_display_vram(void *vram_start);
+void xenfb_pv_display_vram(void *vram_start);
 int xenfb_connect_vkbd(const char *path);
 int xenfb_connect_vfb(const char *path);
 
Index: qemu-xen-traditional-dir-remote/savevm.c
===================================================================
--- qemu-xen-traditional-dir-remote.orig/savevm.c
+++ qemu-xen-traditional-dir-remote/savevm.c
@@ -210,8 +210,8 @@ static int popen_close(void *opaque)
     QEMUFilePopen *s = opaque;
     pclose(s->popen_file);
     qemu_free(s);
-    return 0;
 #endif
+    return 0;
 }
 
 QEMUFile *qemu_popen(FILE *popen_file, const char *mode)
Index: qemu-xen-traditional-dir-remote/xenfbfront.c
===================================================================
--- qemu-xen-traditional-dir-remote.orig/xenfbfront.c
+++ qemu-xen-traditional-dir-remote/xenfbfront.c
@@ -355,7 +355,7 @@ int xenfb_pv_display_init(DisplayState *
     return 0;
 }
 
-int xenfb_pv_display_vram(void *data)
+void xenfb_pv_display_vram(void *data)
 {
     vga_vram = data;
 }

Re: [PATCH] qemu-traditional: fix no-return-in-nonvoid-function

[Ian Jackson]

Olaf Hering writes ("[Xen-devel] [PATCH] qemu-traditional: fix no-return-in-nonvoid-function"):
> rpm post-build-checks found a few issues in qemu-xen-traditional and
> marks them as errors.
> 
> I: Program returns random data in a function
> E: xen no-return-in-nonvoid-function savevm.c:215
> E: xen no-return-in-nonvoid-function /usr/src/packages/BUILD/xen-4.2.25602/non-dbg/stubdom/ioemu/xenfbfront.c:361

Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>