vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-io: Add -C for opening with copy-on-read 

Make it easier to enable copy-on-read during iotests, by
exposing a new bool option to main and open.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
master
Eric Blake 2017-10-05 14:02:43 -05:00 committed by Kevin Wolf
parent bde70715b6
commit 0f40444cc4
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qemu-io.c
View File

@ -102,6 +102,7 @@ static void open_help(void)
" Opens a file for subsequent use by all of the other qemu-io commands.\n" " Opens a file for subsequent use by all of the other qemu-io commands.\n"
" -r, -- open file read-only\n" " -r, -- open file read-only\n"
" -s, -- use snapshot file\n" " -s, -- use snapshot file\n"
" -C, -- use copy-on-read\n"
" -n, -- disable host cache, short for -t none\n" " -n, -- disable host cache, short for -t none\n"
" -U, -- force shared permissions\n" " -U, -- force shared permissions\n"
" -k, -- use kernel AIO implementation (on Linux only)\n" " -k, -- use kernel AIO implementation (on Linux only)\n"
@ -120,7 +121,7 @@ static const cmdinfo_t open_cmd = {
.argmin = 1, .argmin = 1,
.argmax = -1, .argmax = -1,
.flags = CMD_NOFILE_OK, .flags = CMD_NOFILE_OK,
.args = "[-rsnkU] [-t cache] [-d discard] [-o options] [path]", .args = "[-rsCnkU] [-t cache] [-d discard] [-o options] [path]",
.oneline = "open the file specified by path", .oneline = "open the file specified by path",
.help = open_help, .help = open_help,
}; };
@ -145,7 +146,7 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
QDict *opts; QDict *opts;
bool force_share = false; bool force_share = false;
while ((c = getopt(argc, argv, "snro:kt:d:U")) != -1) { while ((c = getopt(argc, argv, "snCro:kt:d:U")) != -1) {
switch (c) { switch (c) {
case 's': case 's':
flags |= BDRV_O_SNAPSHOT; flags |= BDRV_O_SNAPSHOT;
@ -154,6 +155,9 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
flags |= BDRV_O_NOCACHE; flags |= BDRV_O_NOCACHE;
writethrough = false; writethrough = false;
break; break;
case 'C':
flags |= BDRV_O_COPY_ON_READ;
break;
case 'r': case 'r':
readonly = 1; readonly = 1;
break; break;
@ -251,6 +255,7 @@ static void usage(const char *name)
" -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, short for -t none\n" " -n, --nocache disable host cache, short for -t none\n"
" -C, --copy-on-read enable copy-on-read\n"
" -m, --misalign misalign allocations for O_DIRECT\n" " -m, --misalign misalign allocations for O_DIRECT\n"
" -k, --native-aio use kernel AIO implementation (on Linux only)\n" " -k, --native-aio use kernel AIO implementation (on Linux only)\n"
" -t, --cache=MODE use the given cache mode for the image\n" " -t, --cache=MODE use the given cache mode for the image\n"
@ -439,7 +444,7 @@ static QemuOptsList file_opts = {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int readonly = 0; int readonly = 0;
const char *sopt = "hVc:d:f:rsnmkt:T:U"; const char *sopt = "hVc:d:f:rsnCmkt:T:U";
const struct option lopt[] = { const struct option lopt[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
@ -448,6 +453,7 @@ int main(int argc, char **argv)
{ "read-only", no_argument, NULL, 'r' }, { "read-only", no_argument, NULL, 'r' },
{ "snapshot", no_argument, NULL, 's' }, { "snapshot", no_argument, NULL, 's' },
{ "nocache", no_argument, NULL, 'n' }, { "nocache", no_argument, NULL, 'n' },
{ "copy-on-read", no_argument, NULL, 'C' },
{ "misalign", no_argument, NULL, 'm' }, { "misalign", no_argument, NULL, 'm' },
{ "native-aio", no_argument, NULL, 'k' }, { "native-aio", no_argument, NULL, 'k' },
{ "discard", required_argument, NULL, 'd' }, { "discard", required_argument, NULL, 'd' },
@ -492,6 +498,9 @@ int main(int argc, char **argv)
flags |= BDRV_O_NOCACHE; flags |= BDRV_O_NOCACHE;
writethrough = false; writethrough = false;
break; break;
case 'C':
flags |= BDRV_O_COPY_ON_READ;
break;
case 'd': case 'd':
if (bdrv_parse_discard_flags(optarg, &flags) < 0) { if (bdrv_parse_discard_flags(optarg, &flags) < 0) {
error_report("Invalid discard option: %s", optarg); error_report("Invalid discard option: %s", optarg);