mirror of https://github.com/xemu-project/xemu.git
qemu-io: add flag to mark files growable
Add a -g flag to the open command and the main qemu-io command line to allow opening a file growable. This is only allowed for protocols, mirroring the limitation exposed through bdrv_file_open. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
cf57298af5
commit
9c4bab2668
31
qemu-io.c
31
qemu-io.c
|
@ -1172,7 +1172,7 @@ static const cmdinfo_t close_cmd = {
|
||||||
.oneline = "close the current open file",
|
.oneline = "close the current open file",
|
||||||
};
|
};
|
||||||
|
|
||||||
static int openfile(char *name, int flags)
|
static int openfile(char *name, int flags, int growable)
|
||||||
{
|
{
|
||||||
if (bs) {
|
if (bs) {
|
||||||
fprintf(stderr, "file open already, try 'help close'\n");
|
fprintf(stderr, "file open already, try 'help close'\n");
|
||||||
|
@ -1189,6 +1189,17 @@ static int openfile(char *name, int flags)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (growable) {
|
||||||
|
if (!bs->drv || !bs->drv->protocol_name) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"%s: only protocols can be opened growable\n",
|
||||||
|
progname);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
bs->growable = 1;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1207,6 +1218,7 @@ open_help(void)
|
||||||
" -r, -- open file read-only\n"
|
" -r, -- open file read-only\n"
|
||||||
" -s, -- use snapshot file\n"
|
" -s, -- use snapshot file\n"
|
||||||
" -n, -- disable host cache\n"
|
" -n, -- disable host cache\n"
|
||||||
|
" -g, -- allow file to grow (only applies to protocols)"
|
||||||
"\n");
|
"\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1217,9 +1229,10 @@ open_f(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
int readonly = 0;
|
int readonly = 0;
|
||||||
|
int growable = 0;
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
while ((c = getopt(argc, argv, "snCr")) != EOF) {
|
while ((c = getopt(argc, argv, "snCrg")) != EOF) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 's':
|
case 's':
|
||||||
flags |= BDRV_O_SNAPSHOT;
|
flags |= BDRV_O_SNAPSHOT;
|
||||||
|
@ -1233,6 +1246,9 @@ open_f(int argc, char **argv)
|
||||||
case 'r':
|
case 'r':
|
||||||
readonly = 1;
|
readonly = 1;
|
||||||
break;
|
break;
|
||||||
|
case 'g':
|
||||||
|
growable = 1;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return command_usage(&open_cmd);
|
return command_usage(&open_cmd);
|
||||||
}
|
}
|
||||||
|
@ -1246,7 +1262,7 @@ open_f(int argc, char **argv)
|
||||||
if (optind != argc - 1)
|
if (optind != argc - 1)
|
||||||
return command_usage(&open_cmd);
|
return command_usage(&open_cmd);
|
||||||
|
|
||||||
return openfile(argv[optind], flags);
|
return openfile(argv[optind], flags, growable);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const cmdinfo_t open_cmd = {
|
static const cmdinfo_t open_cmd = {
|
||||||
|
@ -1306,7 +1322,8 @@ static void usage(const char *name)
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int readonly = 0;
|
int readonly = 0;
|
||||||
const char *sopt = "hVc:Crsnm";
|
int growable = 0;
|
||||||
|
const char *sopt = "hVc:Crsnmg";
|
||||||
struct option lopt[] = {
|
struct option lopt[] = {
|
||||||
{ "help", 0, 0, 'h' },
|
{ "help", 0, 0, 'h' },
|
||||||
{ "version", 0, 0, 'V' },
|
{ "version", 0, 0, 'V' },
|
||||||
|
@ -1317,6 +1334,7 @@ int main(int argc, char **argv)
|
||||||
{ "snapshot", 0, 0, 's' },
|
{ "snapshot", 0, 0, 's' },
|
||||||
{ "nocache", 0, 0, 'n' },
|
{ "nocache", 0, 0, 'n' },
|
||||||
{ "misalign", 0, 0, 'm' },
|
{ "misalign", 0, 0, 'm' },
|
||||||
|
{ "growable", 0, 0, 'g' },
|
||||||
{ NULL, 0, 0, 0 }
|
{ NULL, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
int c;
|
int c;
|
||||||
|
@ -1345,6 +1363,9 @@ int main(int argc, char **argv)
|
||||||
case 'm':
|
case 'm':
|
||||||
misalign = 1;
|
misalign = 1;
|
||||||
break;
|
break;
|
||||||
|
case 'g':
|
||||||
|
growable = 1;
|
||||||
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
printf("%s version %s\n", progname, VERSION);
|
printf("%s version %s\n", progname, VERSION);
|
||||||
exit(0);
|
exit(0);
|
||||||
|
@ -1392,7 +1413,7 @@ int main(int argc, char **argv)
|
||||||
flags |= BDRV_O_RDWR;
|
flags |= BDRV_O_RDWR;
|
||||||
|
|
||||||
if ((argc - optind) == 1)
|
if ((argc - optind) == 1)
|
||||||
openfile(argv[optind], flags);
|
openfile(argv[optind], flags, growable);
|
||||||
command_loop();
|
command_loop();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue