Commit f9883880 authored by Stefan Weil's avatar Stefan Weil Committed by Stefan Hajnoczi
Browse files

qemu-io: Fix warnings from static code analysis 



Smatch complains about several global symbols which should be local.

Add the missing 'static' attributes and move the 'extern' declaration
of variable qemuio_misalign to qemu-io.h. This variable also changes
the type from 'int' to 'bool' which better fits documents its use.

Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 9562f69c

include/qemu-io.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ typedef struct cmdinfo { 
    helpfunc_t  help;

} cmdinfo_t;



extern bool qemuio_misalign;



bool qemuio_command(BlockDriverState *bs, const char *cmd);



void qemuio_add_command(const cmdinfo_t *ci);

qemu-io-cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#define CMD_NOFILE_OK   0x01



int qemuio_misalign;

bool qemuio_misalign;



static cmdinfo_t *cmdtab;

static int ncmds;

qemu-io.c

+3 −4
Original line number Diff line number Diff line
@@ -24,10 +24,9 @@ 


#define CMD_NOFILE_OK   0x01



char *progname;

static char *progname;



BlockDriverState *qemuio_bs;

extern int qemuio_misalign;

static BlockDriverState *qemuio_bs;



/* qemu-io commands passed using -c */

static int ncmdline;
@@ -408,7 +407,7 @@ int main(int argc, char **argv) 
            readonly = 1;

            break;

        case 'm':

            qemuio_misalign = 1;

            qemuio_misalign = true;

            break;

        case 'g':

            growable = 1;