diff mbox

tools: fix compile errors with -Og

Message ID 1460469319-12877-1-git-send-email-olaf@aepfle.de (mailing list archive)
State New, archived
Headers show

Commit Message

Olaf Hering April 12, 2016, 1:55 p.m. UTC
At least gcc-4.8 and older fails to recognize that err is always
initialized, the build fails:
  xc_cpupool.c: In function 'xc_cpupool_removecpu':
  xc_cpupool.c:168:5: error: 'err' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    return err;

Fix this in blktap2 and libxc.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 tools/blktap2/drivers/tapdisk-vbd.c | 6 +++---
 tools/libxc/xc_cpupool.c            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Dario Faggioli April 13, 2016, 12:05 p.m. UTC | #1
On Tue, 2016-04-12 at 15:55 +0200, Olaf Hering wrote:
> At least gcc-4.8 and older fails to recognize that err is always
> initialized, the build fails:
>   xc_cpupool.c: In function 'xc_cpupool_removecpu':
>   xc_cpupool.c:168:5: error: 'err' may be used uninitialized in this
> function [-Werror=maybe-uninitialized]
>     return err;
> 
> Fix this in blktap2 and libxc.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
>
Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>

Regards,
Dario
Wei Liu April 22, 2016, 6:09 p.m. UTC | #2
On Tue, Apr 12, 2016 at 03:55:19PM +0200, Olaf Hering wrote:
> At least gcc-4.8 and older fails to recognize that err is always
> initialized, the build fails:
>   xc_cpupool.c: In function 'xc_cpupool_removecpu':
>   xc_cpupool.c:168:5: error: 'err' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>     return err;
> 
> Fix this in blktap2 and libxc.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>

And queued.
diff mbox

Patch

diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c
index 89ef9ed..31bc2fe 100644
--- a/tools/blktap2/drivers/tapdisk-vbd.c
+++ b/tools/blktap2/drivers/tapdisk-vbd.c
@@ -516,7 +516,7 @@  tapdisk_vbd_free_stack(td_vbd_t *vbd)
 int
 tapdisk_vbd_open_stack(td_vbd_t *vbd, uint16_t storage, td_flag_t flags)
 {
-	int i, err;
+	int i, err = 0;
 
 	vbd->flags   = flags;
 	vbd->storage = storage;
@@ -932,7 +932,7 @@  tapdisk_vbd_open_image(td_vbd_t *vbd, td_image_t *image)
 static int
 tapdisk_vbd_close_and_reopen_image(td_vbd_t *vbd, td_image_t *image)
 {
-	int i, err;
+	int i, err = 0;
 
 	td_close(image);
 
@@ -972,7 +972,7 @@  tapdisk_vbd_pause(td_vbd_t *vbd)
 int
 tapdisk_vbd_resume(td_vbd_t *vbd, const char *path, uint16_t drivertype)
 {
-	int i, err;
+	int i, err = 0;
 
 	if (!td_flag_test(vbd->state, TD_VBD_PAUSED)) {
 		EPRINTF("resume request for unpaused vbd %s\n", vbd->name);
diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c
index 261b9c9..abf707d 100644
--- a/tools/libxc/xc_cpupool.c
+++ b/tools/libxc/xc_cpupool.c
@@ -151,7 +151,7 @@  int xc_cpupool_removecpu(xc_interface *xch,
                          int cpu)
 {
     unsigned retries;
-    int err;
+    int err = 0;
     DECLARE_SYSCTL;
 
     sysctl.cmd = XEN_SYSCTL_cpupool_op;