Commit e681be7e authored by Kevin Wolf's avatar Kevin Wolf Committed by Stefan Hajnoczi
Browse files

qemu-io: Move 'quit' function 



This one only makes sense in the context of the qemu-io tool, so move it
to qemu-io.c. Adapt coding style and register it like other commands.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent f18a834a

cmd.c

+0 −29
Original line number Diff line number Diff line
@@ -410,32 +410,3 @@ timestr( 
		snprintf(ts, size, "0.%04u sec", (unsigned int) (usec * 10000));

	}

}
 




/* from libxcmd/quit.c */



static cmdinfo_t quit_cmd;



/* ARGSUSED */

static int

quit_f(

    BlockDriverState *bs,

	int	argc,

	char	**argv)

{

	return 1;

}



void

quit_init(void)

{

	quit_cmd.name = _("quit");

	quit_cmd.altname = _("q");

	quit_cmd.cfunc = quit_f;

	quit_cmd.argmin = -1;

	quit_cmd.argmax = -1;

	quit_cmd.flags = CMD_FLAG_GLOBAL;

	quit_cmd.oneline = _("exit the program");



	add_command(&quit_cmd);

}

cmd.h

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ typedef struct cmdinfo { 
extern cmdinfo_t	*cmdtab;

extern int		ncmds;



void quit_init(void);



typedef int (*checkfunc_t)(BlockDriverState *bs, const cmdinfo_t *ci);



void add_command(const cmdinfo_t *ci);

qemu-io.c

+16 −1
Original line number Diff line number Diff line
@@ -137,6 +137,21 @@ static int open_f(BlockDriverState *bs, int argc, char **argv) 
    return openfile(argv[optind], flags, growable);

}



static int quit_f(BlockDriverState *bs, int argc, char **argv)

{

    return 1;

}



static const cmdinfo_t quit_cmd = {

    .name       = "quit",

    .altname    = "q",

    .cfunc      = quit_f,

    .argmin     = -1,

    .argmax     = -1,

    .flags      = CMD_FLAG_GLOBAL,

    .oneline    = "exit the program",

};



static void usage(const char *name)

{

    printf(
@@ -247,7 +262,7 @@ int main(int argc, char **argv) 
    bdrv_init();



    /* initialize commands */

    quit_init();

    add_command(&quit_cmd);

    add_command(&open_cmd);

    add_command(&close_cmd);