From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 23 Jul 2012 16:56:13 +0000 (+0100)
Subject: qemu-traditional: fix no-return-in-nonvoid-function
X-Git-Tag: xen-4.2.0-rc1^0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=00fb2aae68e915b7f456fd5e3997ddf31339004a;p=qemu-xen-4.5-testing.git

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

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

diff --git a/qemu-xen.h b/qemu-xen.h
index d50c89f1b..059866874 100644
--- a/qemu-xen.h
+++ b/qemu-xen.h
@@ -129,7 +129,7 @@ int xenstore_find_device(BlockDriverState *bs);
 
 /* 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);
 
diff --git a/savevm.c b/savevm.c
index 71a57ebac..746a713b9 100644
--- a/savevm.c
+++ b/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)
diff --git a/xenfbfront.c b/xenfbfront.c
index ed79cde73..d83693fca 100644
--- a/xenfbfront.c
+++ b/xenfbfront.c
@@ -355,7 +355,7 @@ int xenfb_pv_display_init(DisplayState *ds)
     return 0;
 }
 
-int xenfb_pv_display_vram(void *data)
+void xenfb_pv_display_vram(void *data)
 {
     vga_vram = data;
 }