ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-io: Allow explicitly specifying format 

This adds a -f option to qemu-io which allows to explicitly specify the
block driver to use for the given image.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1416497234-29880-2-git-send-email-kwolf@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2014-11-20 16:27:06 +01:00
parent e465ce7d09
commit be6273da9e
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qemu-io.c
View File

@ -51,7 +51,8 @@ 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, int growable, QDict *opts) static int openfile(char *name, BlockDriver *drv, int flags, int growable,
QDict *opts)
{ {
Error *local_err = NULL; Error *local_err = NULL;
@ -68,7 +69,7 @@ static int openfile(char *name, int flags, int growable, QDict *opts)
flags |= BDRV_O_PROTOCOL; flags |= BDRV_O_PROTOCOL;
} }
if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err) < 0) { if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, drv, &local_err) < 0) {
fprintf(stderr, "%s: can't open%s%s: %s\n", progname, fprintf(stderr, "%s: can't open%s%s: %s\n", progname,
name ? " device " : "", name ?: "", name ? " device " : "", name ?: "",
error_get_pretty(local_err)); error_get_pretty(local_err));
@ -169,9 +170,9 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)
qemu_opts_reset(&empty_opts); qemu_opts_reset(&empty_opts);
if (optind == argc - 1) { if (optind == argc - 1) {
return openfile(argv[optind], flags, growable, opts); return openfile(argv[optind], NULL, flags, growable, opts);
} else if (optind == argc) { } else if (optind == argc) {
return openfile(NULL, flags, growable, opts); return openfile(NULL, NULL, flags, growable, opts);
} else { } else {
QDECREF(opts); QDECREF(opts);
return qemuio_command_usage(&open_cmd); return qemuio_command_usage(&open_cmd);
@ -196,11 +197,12 @@ static const cmdinfo_t quit_cmd = {
static void usage(const char *name) static void usage(const char *name)
{ {
printf( printf(
"Usage: %s [-h] [-V] [-rsnm] [-c STRING] ... [file]\n" "Usage: %s [-h] [-V] [-rsnm] [-f FMT] [-c STRING] ... [file]\n"
"QEMU Disk exerciser\n" "QEMU Disk exerciser\n"
"\n" "\n"
" -c, --cmd STRING execute command with its arguments\n" " -c, --cmd STRING execute command with its arguments\n"
" from the given string\n" " from the given string\n"
" -f, --format FMT specifies the block driver to use\n"
" -r, --read-only export read-only\n" " -r, --read-only export read-only\n"
" -s, --snapshot use snapshot file\n" " -s, --snapshot use snapshot file\n"
" -n, --nocache disable host cache\n" " -n, --nocache disable host cache\n"
@ -364,12 +366,13 @@ int main(int argc, char **argv)
{ {
int readonly = 0; int readonly = 0;
int growable = 0; int growable = 0;
const char *sopt = "hVc:d:rsnmgkt:T:"; const char *sopt = "hVc:d:f:rsnmgkt:T:";
const struct option lopt[] = { const struct option lopt[] = {
{ "help", 0, NULL, 'h' }, { "help", 0, NULL, 'h' },
{ "version", 0, NULL, 'V' }, { "version", 0, NULL, 'V' },
{ "offset", 1, NULL, 'o' }, { "offset", 1, NULL, 'o' },
{ "cmd", 1, NULL, 'c' }, { "cmd", 1, NULL, 'c' },
{ "format", 1, NULL, 'f' },
{ "read-only", 0, NULL, 'r' }, { "read-only", 0, NULL, 'r' },
{ "snapshot", 0, NULL, 's' }, { "snapshot", 0, NULL, 's' },
{ "nocache", 0, NULL, 'n' }, { "nocache", 0, NULL, 'n' },
@ -384,6 +387,7 @@ int main(int argc, char **argv)
int c; int c;
int opt_index = 0; int opt_index = 0;
int flags = BDRV_O_UNMAP; int flags = BDRV_O_UNMAP;
BlockDriver *drv = NULL;
Error *local_error = NULL; Error *local_error = NULL;
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX
@ -393,6 +397,8 @@ int main(int argc, char **argv)
progname = basename(argv[0]); progname = basename(argv[0]);
qemu_init_exec_dir(argv[0]); qemu_init_exec_dir(argv[0]);
bdrv_init();
while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) { while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) {
switch (c) { switch (c) {
case 's': case 's':
@ -407,6 +413,13 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
break; break;
case 'f':
drv = bdrv_find_format(optarg);
if (!drv) {
error_report("Invalid format '%s'", optarg);
exit(EXIT_FAILURE);
}
break;
case 'c': case 'c':
add_user_command(optarg); add_user_command(optarg);
break; break;
@ -455,7 +468,6 @@ int main(int argc, char **argv)
error_free(local_error); error_free(local_error);
exit(1); exit(1);
} }
bdrv_init();
/* initialize commands */ /* initialize commands */
qemuio_add_command(&quit_cmd); qemuio_add_command(&quit_cmd);
@ -477,7 +489,7 @@ int main(int argc, char **argv)
} }
if ((argc - optind) == 1) { if ((argc - optind) == 1) {
openfile(argv[optind], flags, growable, NULL); openfile(argv[optind], drv, flags, growable, NULL);
} }
command_loop(); command_loop();