From: Fam Zheng <famz@redhat.com>

It can be used outside of block.c for making user friendly messages.

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

block.c | 2 +-

include/block/block.h | 2 ++

2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ static char *bdrv_child_user_desc(BdrvChild *c)

return g_strdup("another user");

}

-static char *bdrv_perm_names(uint64_t perm)

+char *bdrv_perm_names(uint64_t perm)

{

struct perm_name {

uint64_t perm;

diff --git a/include/block/block.h b/include/block/block.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block.h

+++ b/include/block/block.h

@@ -XXX,XX +XXX,XX @@ enum {

BLK_PERM_ALL = 0x1f,

};

+char *bdrv_perm_names(uint64_t perm);

+

/* disk I/O throttling */

void bdrv_init(void);

void bdrv_init_with_whitelist(void);

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

block.c | 17 +++++++++++++++++

include/block/block.h | 1 +

include/block/block_int.h | 1 +

qapi/block-core.json | 3 +++

4 files changed, 22 insertions(+)

diff --git a/block.c b/block.c

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options,

* the parent. */

qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_DIRECT);

qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_NO_FLUSH);

+ qdict_copy_default(child_options, parent_options, BDRV_OPT_FORCE_SHARE);

/* Inherit the read-only option from the parent if it's not set */

qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);

@@ -XXX,XX +XXX,XX @@ static void bdrv_backing_options(int *child_flags, QDict *child_options,

* which is only applied on the top level (BlockBackend) */

qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_DIRECT);

qdict_copy_default(child_options, parent_options, BDRV_OPT_CACHE_NO_FLUSH);

+ qdict_copy_default(child_options, parent_options, BDRV_OPT_FORCE_SHARE);

/* backing files always opened read-only */

qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on");

@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {

.type = QEMU_OPT_STRING,

.help = "discard operation (ignore/off, unmap/on)",

},

+ {

+ .name = BDRV_OPT_FORCE_SHARE,

+ .type = QEMU_OPT_BOOL,

+ .help = "always accept other writers (default: off)",

+ },

{ /* end of list */ }

},

};

@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,

drv = bdrv_find_format(driver_name);

assert(drv != NULL);

+ bs->force_share = qemu_opt_get_bool(opts, BDRV_OPT_FORCE_SHARE, false);

+

+ if (bs->force_share && (bs->open_flags & BDRV_O_RDWR)) {

+ error_setg(errp,

+ BDRV_OPT_FORCE_SHARE

+ "=on can only be used with read-only images");

+ ret = -EINVAL;

+ goto fail_opts;

+ }

+

if (file != NULL) {

filename = blk_bs(file)->filename;

} else {

diff --git a/include/block/block.h b/include/block/block.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block.h

+++ b/include/block/block.h

@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {

#define BDRV_OPT_CACHE_NO_FLUSH "cache.no-flush"

#define BDRV_OPT_READ_ONLY "read-only"

#define BDRV_OPT_DISCARD "discard"

+#define BDRV_OPT_FORCE_SHARE "force-share"

#define BDRV_SECTOR_BITS 9

diff --git a/include/block/block_int.h b/include/block/block_int.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -XXX,XX +XXX,XX @@ struct BlockDriverState {

bool valid_key; /* if true, a valid encryption key has been set */

bool sg; /* if true, the device is a /dev/sg* */

bool probed; /* if true, format was probed rather than specified */

+ bool force_share; /* if true, always allow all shared permissions */

BlockDriver *drv; /* NULL means no media */

void *opaque;

diff --git a/qapi/block-core.json b/qapi/block-core.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

# (default: false)

# @detect-zeroes: detect and optimize zero writes (Since 2.1)

# (default: off)

+# @force-share: force share all permission on added nodes.

+# Requires read-only=true. (Since 2.10)

#

# Remaining options are determined by the block driver.

#

@@ -XXX,XX +XXX,XX @@

'*discard': 'BlockdevDiscardOptions',

'*cache': 'BlockdevCacheOptions',

'*read-only': 'bool',

+ '*force-share': 'bool',

'*detect-zeroes': 'BlockdevDetectZeroesOptions' },

'discriminator': 'driver',

'data': {

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

block.c | 32 ++++++++++++++++++++++++--------

1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/block.c b/block.c

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

static void bdrv_child_abort_perm_update(BdrvChild *c);

static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared);

+static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,

+ BdrvChild *c,

+ const BdrvChildRole *role,

+ uint64_t parent_perm, uint64_t parent_shared,

+ uint64_t *nperm, uint64_t *nshared)

+{

+ if (bs->drv && bs->drv->bdrv_child_perm) {

+ bs->drv->bdrv_child_perm(bs, c, role,

+ parent_perm, parent_shared,

+ nperm, nshared);

+ }

+ if (child_bs && child_bs->force_share) {

+ *nshared = BLK_PERM_ALL;

+ }

+}

+

/*

* Check whether permissions on this node can be changed in a way that

* @cumulative_perms and @cumulative_shared_perms are the new cumulative

@@ -XXX,XX +XXX,XX @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms,

/* Check all children */

QLIST_FOREACH(c, &bs->children, next) {

uint64_t cur_perm, cur_shared;

- drv->bdrv_child_perm(bs, c, c->role,

- cumulative_perms, cumulative_shared_perms,

- &cur_perm, &cur_shared);

+ bdrv_child_perm(bs, c->bs, c, c->role,

+ cumulative_perms, cumulative_shared_perms,

+ &cur_perm, &cur_shared);

ret = bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_children,

errp);

if (ret < 0) {

@@ -XXX,XX +XXX,XX @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms,

/* Update all children */

QLIST_FOREACH(c, &bs->children, next) {

uint64_t cur_perm, cur_shared;

- drv->bdrv_child_perm(bs, c, c->role,

- cumulative_perms, cumulative_shared_perms,

- &cur_perm, &cur_shared);

+ bdrv_child_perm(bs, c->bs, c, c->role,

+ cumulative_perms, cumulative_shared_perms,

+ &cur_perm, &cur_shared);

bdrv_child_set_perm(c, cur_perm, cur_shared);

}

}

@@ -XXX,XX +XXX,XX @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,

assert(parent_bs->drv);

assert(bdrv_get_aio_context(parent_bs) == bdrv_get_aio_context(child_bs));

- parent_bs->drv->bdrv_child_perm(parent_bs, NULL, child_role,

- perm, shared_perm, &perm, &shared_perm);

+ bdrv_child_perm(parent_bs, child_bs, NULL, child_role,

+ perm, shared_perm, &perm, &shared_perm);

child = bdrv_root_attach_child(child_bs, child_name, child_role,

perm, shared_perm, parent_bs, errp);

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>

This will force the opened images to allow sharing all permissions with other

programs.

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

qemu-img.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++---------------

1 file changed, 117 insertions(+), 36 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/qobject-output-visitor.h"

#include "qapi/qmp/qerror.h"

#include "qapi/qmp/qjson.h"

+#include "qapi/qmp/qbool.h"

#include "qemu/cutils.h"

#include "qemu/config-file.h"

#include "qemu/option.h"

@@ -XXX,XX +XXX,XX @@ static int img_open_password(BlockBackend *blk, const char *filename,

static BlockBackend *img_open_opts(const char *optstr,

QemuOpts *opts, int flags, bool writethrough,

- bool quiet)

+ bool quiet, bool force_share)

{

QDict *options;

Error *local_err = NULL;

BlockBackend *blk;

options = qemu_opts_to_qdict(opts, NULL);

+ if (force_share) {

+ if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE)

+ && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) {

+ error_report("--force-share/-U conflicts with image options");

+ return NULL;

+ }

+ qdict_put(options, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));

+ }

blk = blk_new_open(NULL, NULL, options, flags, &local_err);

if (!blk) {

error_reportf_err(local_err, "Could not open '%s': ", optstr);

@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open_opts(const char *optstr,

static BlockBackend *img_open_file(const char *filename,

const char *fmt, int flags,

- bool writethrough, bool quiet)

+ bool writethrough, bool quiet,

+ bool force_share)

{

BlockBackend *blk;

Error *local_err = NULL;

- QDict *options = NULL;

+ QDict *options = qdict_new();

if (fmt) {

- options = qdict_new();

qdict_put_str(options, "driver", fmt);

}

+ if (force_share) {

+ qdict_put(options, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));

+ }

blk = blk_new_open(filename, NULL, options, flags, &local_err);

if (!blk) {

error_reportf_err(local_err, "Could not open '%s': ", filename);

@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open_file(const char *filename,

static BlockBackend *img_open(bool image_opts,

const char *filename,

const char *fmt, int flags, bool writethrough,

- bool quiet)

+ bool quiet, bool force_share)

{

BlockBackend *blk;

if (image_opts) {

@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open(bool image_opts,

if (!opts) {

return NULL;

}

- blk = img_open_opts(filename, opts, flags, writethrough, quiet);

+ blk = img_open_opts(filename, opts, flags, writethrough, quiet,

+ force_share);

} else {

- blk = img_open_file(filename, fmt, flags, writethrough, quiet);

+ blk = img_open_file(filename, fmt, flags, writethrough, quiet,

+ force_share);

}

return blk;

}

@@ -XXX,XX +XXX,XX @@ static int img_check(int argc, char **argv)

ImageCheck *check;

bool quiet = false;

bool image_opts = false;

+ bool force_share = false;

fmt = NULL;

output = NULL;

@@ -XXX,XX +XXX,XX @@ static int img_check(int argc, char **argv)

{"output", required_argument, 0, OPTION_OUTPUT},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":hf:r:T:q",

+ c = getopt_long(argc, argv, ":hf:r:T:qU",

long_options, &option_index);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_check(int argc, char **argv)

case 'q':

quiet = true;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OBJECT: {

QemuOpts *opts;

opts = qemu_opts_parse_noisily(&qemu_object_opts,

@@ -XXX,XX +XXX,XX @@ static int img_check(int argc, char **argv)

return 1;

}

- blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);

+ blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,

+ force_share);

if (!blk) {

return 1;

}

@@ -XXX,XX +XXX,XX @@ static int img_commit(int argc, char **argv)

return 1;

}

- blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);

+ blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,

+ false);

if (!blk) {

return 1;

}

@@ -XXX,XX +XXX,XX @@ static int img_compare(int argc, char **argv)

int c, pnum;

uint64_t progress_base;

bool image_opts = false;

+ bool force_share = false;

cache = BDRV_DEFAULT_CACHE;

for (;;) {

@@ -XXX,XX +XXX,XX @@ static int img_compare(int argc, char **argv)

{"help", no_argument, 0, 'h'},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":hf:F:T:pqs",

+ c = getopt_long(argc, argv, ":hf:F:T:pqsU",

long_options, NULL);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_compare(int argc, char **argv)

case 's':

strict = true;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OBJECT: {

QemuOpts *opts;

opts = qemu_opts_parse_noisily(&qemu_object_opts,

@@ -XXX,XX +XXX,XX @@ static int img_compare(int argc, char **argv)

goto out3;

}

- blk1 = img_open(image_opts, filename1, fmt1, flags, writethrough, quiet);

+ blk1 = img_open(image_opts, filename1, fmt1, flags, writethrough, quiet,

+ force_share);

if (!blk1) {

ret = 2;

goto out3;

}

- blk2 = img_open(image_opts, filename2, fmt2, flags, writethrough, quiet);

+ blk2 = img_open(image_opts, filename2, fmt2, flags, writethrough, quiet,

+ force_share);

if (!blk2) {

ret = 2;

goto out2;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

bool writethrough, src_writethrough, quiet = false, image_opts = false,

skip_create = false, progress = false;

int64_t ret = -EINVAL;

+ bool force_share = false;

ImgConvertState s = (ImgConvertState) {

/* Need at least 4k of zeros for sparse detection */

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

{"help", no_argument, 0, 'h'},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:W",

+ c = getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:WU",

long_options, NULL);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

case 'W':

s.wr_in_order = false;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OBJECT: {

QemuOpts *object_opts;

object_opts = qemu_opts_parse_noisily(&qemu_object_opts,

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

for (bs_i = 0; bs_i < s.src_num; bs_i++) {

s.src[bs_i] = img_open(image_opts, argv[optind + bs_i],

- fmt, src_flags, src_writethrough, quiet);

+ fmt, src_flags, src_writethrough, quiet,

+ force_share);

if (!s.src[bs_i]) {

ret = -1;

goto out;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

* the bdrv_create() call which takes different params.

* Not critical right now, so fix can wait...

*/

- s.target = img_open_file(out_filename, out_fmt, flags, writethrough, quiet);

+ s.target = img_open_file(out_filename, out_fmt, flags, writethrough, quiet,

+ false);

if (!s.target) {

ret = -1;

goto out;

@@ -XXX,XX +XXX,XX @@ static gboolean str_equal_func(gconstpointer a, gconstpointer b)

static ImageInfoList *collect_image_info_list(bool image_opts,

const char *filename,

const char *fmt,

- bool chain)

+ bool chain, bool force_share)

{

ImageInfoList *head = NULL;

ImageInfoList **last = &head;

@@ -XXX,XX +XXX,XX @@ static ImageInfoList *collect_image_info_list(bool image_opts,

g_hash_table_insert(filenames, (gpointer)filename, NULL);

blk = img_open(image_opts, filename, fmt,

- BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false);

+ BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false,

+ force_share);

if (!blk) {

goto err;

}

@@ -XXX,XX +XXX,XX @@ static int img_info(int argc, char **argv)

const char *filename, *fmt, *output;

ImageInfoList *list;

bool image_opts = false;

+ bool force_share = false;

fmt = NULL;

output = NULL;

@@ -XXX,XX +XXX,XX @@ static int img_info(int argc, char **argv)

{"backing-chain", no_argument, 0, OPTION_BACKING_CHAIN},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":f:h",

+ c = getopt_long(argc, argv, ":f:hU",

long_options, &option_index);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_info(int argc, char **argv)

case 'f':

fmt = optarg;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OUTPUT:

output = optarg;

break;

@@ -XXX,XX +XXX,XX @@ static int img_info(int argc, char **argv)

return 1;

}

- list = collect_image_info_list(image_opts, filename, fmt, chain);

+ list = collect_image_info_list(image_opts, filename, fmt, chain,

+ force_share);

if (!list) {

return 1;

}

@@ -XXX,XX +XXX,XX @@ static int img_map(int argc, char **argv)

MapEntry curr = { .length = 0 }, next;

int ret = 0;

bool image_opts = false;

+ bool force_share = false;

fmt = NULL;

output = NULL;

@@ -XXX,XX +XXX,XX @@ static int img_map(int argc, char **argv)

{"output", required_argument, 0, OPTION_OUTPUT},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":f:h",

+ c = getopt_long(argc, argv, ":f:hU",

long_options, &option_index);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_map(int argc, char **argv)

case 'f':

fmt = optarg;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OUTPUT:

output = optarg;

break;

@@ -XXX,XX +XXX,XX @@ static int img_map(int argc, char **argv)

return 1;

}

- blk = img_open(image_opts, filename, fmt, 0, false, false);

+ blk = img_open(image_opts, filename, fmt, 0, false, false, force_share);

if (!blk) {

return 1;

}

@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)

bool quiet = false;

Error *err = NULL;

bool image_opts = false;

+ bool force_share = false;

bdrv_oflags = BDRV_O_RDWR;

/* Parse commandline parameters */

@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)

{"help", no_argument, 0, 'h'},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":la:c:d:hq",

+ c = getopt_long(argc, argv, ":la:c:d:hqU",

long_options, NULL);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)

case 'q':

quiet = true;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OBJECT: {

QemuOpts *opts;

opts = qemu_opts_parse_noisily(&qemu_object_opts,

@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)

}

/* Open the image */

- blk = img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet);

+ blk = img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet,

+ force_share);

if (!blk) {

return 1;

}

@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)

int c, flags, src_flags, ret;

bool writethrough, src_writethrough;

int unsafe = 0;

+ bool force_share = false;

int progress = 0;

bool quiet = false;

Error *local_err = NULL;

@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)

{"help", no_argument, 0, 'h'},

{"object", required_argument, 0, OPTION_OBJECT},

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":hf:F:b:upt:T:q",

+ c = getopt_long(argc, argv, ":hf:F:b:upt:T:qU",

long_options, NULL);

if (c == -1) {

break;

@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)

case OPTION_IMAGE_OPTS:

image_opts = true;

break;

+ case 'U':

+ force_share = true;

+ break;

}

}

@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)

* Ignore the old backing file for unsafe rebase in case we want to correct

* the reference to a renamed or moved backing file.

*/

- blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);

+ blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,

+ false);

if (!blk) {

ret = -1;

goto out;

@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)

qdict_put_str(options, "driver", bs->backing_format);

}

+ if (force_share) {

+ if (!options) {

+ options = qdict_new();

+ }

+ qdict_put(options, BDRV_OPT_FORCE_SHARE,

+ qbool_from_bool(true));

+ }

bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name));

blk_old_backing = blk_new_open(backing_name, NULL,

options, src_flags, &local_err);

@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)

}

if (out_baseimg[0]) {

+ options = qdict_new();

if (out_basefmt) {

- options = qdict_new();

qdict_put_str(options, "driver", out_basefmt);

- } else {

- options = NULL;

+ }

+ if (force_share) {

+ qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);

}

blk_new_backing = blk_new_open(out_baseimg, NULL,

@@ -XXX,XX +XXX,XX @@ static int img_resize(int argc, char **argv)

qemu_opts_del(param);

blk = img_open(image_opts, filename, fmt,

- BDRV_O_RDWR | BDRV_O_RESIZE, false, quiet);

+ BDRV_O_RDWR | BDRV_O_RESIZE, false, quiet,

+ false);

if (!blk) {

ret = -1;

goto out;

@@ -XXX,XX +XXX,XX @@ static int img_amend(int argc, char **argv)

goto out;

}

- blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);

+ blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,

+ false);

if (!blk) {

ret = -1;

goto out;

@@ -XXX,XX +XXX,XX @@ static int img_bench(int argc, char **argv)

bool writethrough = false;

struct timeval t1, t2;

int i;

+ bool force_share = false;

for (;;) {

static const struct option long_options[] = {

@@ -XXX,XX +XXX,XX @@ static int img_bench(int argc, char **argv)

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

{"pattern", required_argument, 0, OPTION_PATTERN},

{"no-drain", no_argument, 0, OPTION_NO_DRAIN},

+ {"force-share", no_argument, 0, 'U'},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:w", long_options, NULL);

+ c = getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:wU", long_options, NULL);

if (c == -1) {

break;

}

@@ -XXX,XX +XXX,XX @@ static int img_bench(int argc, char **argv)

flags |= BDRV_O_RDWR;

is_write = true;

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_PATTERN:

{

unsigned long res;

@@ -XXX,XX +XXX,XX @@ static int img_bench(int argc, char **argv)

goto out;

}

- blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);

+ blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,

+ force_share);

if (!blk) {

ret = -1;

goto out;

@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)

const char *fmt = NULL;

int64_t size = 0;

int64_t block_count = 0, out_pos, in_pos;

+ bool force_share = false;

struct DdInfo dd = {

.flags = 0,

.count = 0,

@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)

const struct option long_options[] = {

{ "help", no_argument, 0, 'h'},

{ "image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+ { "force-share", no_argument, 0, 'U'},

{ 0, 0, 0, 0 }

};

- while ((c = getopt_long(argc, argv, ":hf:O:", long_options, NULL))) {

+ while ((c = getopt_long(argc, argv, ":hf:O:U", long_options, NULL))) {

if (c == EOF) {

break;

}

@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)

case 'h':

help();

break;

+ case 'U':

+ force_share = true;

+ break;

case OPTION_IMAGE_OPTS:

image_opts = true;

break;

@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)

ret = -1;

goto out;

}

- blk1 = img_open(image_opts, in.filename, fmt, 0, false, false);

+ blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,

+ force_share);

if (!blk1) {

ret = -1;

@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)

}

blk2 = img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR,

- false, false);

+ false, false, false);

if (!blk2) {

ret = -1;

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

qemu-img-cmds.hx | 36 ++++++++++++++++++------------------

1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img-cmds.hx

+++ b/qemu-img-cmds.hx

@@ -XXX,XX +XXX,XX @@ STEXI

ETEXI

DEF("bench", img_bench,

- "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval] [-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-w] filename")

+ "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval] [-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-w] [-U] filename")

STEXI

-@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var{cache}] [-w] @var{filename}

+@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var{cache}] [-w] [-U] @var{filename}

ETEXI

DEF("check", img_check,

- "check [-q] [--object objectdef] [--image-opts] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] filename")

+ "check [-q] [--object objectdef] [--image-opts] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename")

STEXI

-@item check [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}] [--output=@var{ofmt}] [-r [leaks | all]] [-T @var{src_cache}] @var{filename}

+@item check [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}] [--output=@var{ofmt}] [-r [leaks | all]] [-T @var{src_cache}] [-U] @var{filename}

ETEXI

DEF("create", img_create,

@@ -XXX,XX +XXX,XX @@ STEXI

ETEXI

DEF("compare", img_compare,

- "compare [--object objectdef] [--image-opts] [-f fmt] [-F fmt] [-T src_cache] [-p] [-q] [-s] filename1 filename2")

+ "compare [--object objectdef] [--image-opts] [-f fmt] [-F fmt] [-T src_cache] [-p] [-q] [-s] [-U] filename1 filename2")

STEXI

-@item compare [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [-F @var{fmt}] [-T @var{src_cache}] [-p] [-q] [-s] @var{filename1} @var{filename2}

+@item compare [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [-F @var{fmt}] [-T @var{src_cache}] [-p] [-q] [-s] [-U] @var{filename1} @var{filename2}

ETEXI

DEF("convert", img_convert,

- "convert [--object objectdef] [--image-opts] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")

+ "convert [--object objectdef] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")

STEXI

-@item convert [--object @var{objectdef}] [--image-opts] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}

+@item convert [--object @var{objectdef}] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}

ETEXI

DEF("dd", img_dd,

- "dd [--image-opts] [-f fmt] [-O output_fmt] [bs=block_size] [count=blocks] [skip=blocks] if=input of=output")

+ "dd [--image-opts] [-U] [-f fmt] [-O output_fmt] [bs=block_size] [count=blocks] [skip=blocks] if=input of=output")

STEXI

-@item dd [--image-opts] [-f @var{fmt}] [-O @var{output_fmt}] [bs=@var{block_size}] [count=@var{blocks}] [skip=@var{blocks}] if=@var{input} of=@var{output}

+@item dd [--image-opts] [-U] [-f @var{fmt}] [-O @var{output_fmt}] [bs=@var{block_size}] [count=@var{blocks}] [skip=@var{blocks}] if=@var{input} of=@var{output}

ETEXI

DEF("info", img_info,

- "info [--object objectdef] [--image-opts] [-f fmt] [--output=ofmt] [--backing-chain] filename")

+ "info [--object objectdef] [--image-opts] [-f fmt] [--output=ofmt] [--backing-chain] [-U] filename")

STEXI

-@item info [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--output=@var{ofmt}] [--backing-chain] @var{filename}

+@item info [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--output=@var{ofmt}] [--backing-chain] [-U] @var{filename}

ETEXI

DEF("map", img_map,

- "map [--object objectdef] [--image-opts] [-f fmt] [--output=ofmt] filename")

+ "map [--object objectdef] [--image-opts] [-f fmt] [--output=ofmt] [-U] filename")

STEXI

-@item map [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--output=@var{ofmt}] @var{filename}

+@item map [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--output=@var{ofmt}] [-U] @var{filename}

ETEXI

DEF("snapshot", img_snapshot,

- "snapshot [--object objectdef] [--image-opts] [-q] [-l | -a snapshot | -c snapshot | -d snapshot] filename")

+ "snapshot [--object objectdef] [--image-opts] [-U] [-q] [-l | -a snapshot | -c snapshot | -d snapshot] filename")

STEXI

-@item snapshot [--object @var{objectdef}] [--image-opts] [-q] [-l | -a @var{snapshot} | -c @var{snapshot} | -d @var{snapshot}] @var{filename}

+@item snapshot [--object @var{objectdef}] [--image-opts] [-U] [-q] [-l | -a @var{snapshot} | -c @var{snapshot} | -d @var{snapshot}] @var{filename}

ETEXI

DEF("rebase", img_rebase,

- "rebase [--object objectdef] [--image-opts] [-q] [-f fmt] [-t cache] [-T src_cache] [-p] [-u] -b backing_file [-F backing_fmt] filename")

+ "rebase [--object objectdef] [--image-opts] [-U] [-q] [-f fmt] [-t cache] [-T src_cache] [-p] [-u] -b backing_file [-F backing_fmt] filename")

STEXI

-@item rebase [--object @var{objectdef}] [--image-opts] [-q] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}

+@item rebase [--object @var{objectdef}] [--image-opts] [-U] [-q] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}

ETEXI

DEF("resize", img_resize,

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>

Add --force-share/-U to program options and -U to open subcommand.

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

qemu-io.c | 42 ++++++++++++++++++++++++++++++++++--------

1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/qemu-io.c b/qemu-io.c

index XXXXXXX..XXXXXXX 100644

--- a/qemu-io.c

+++ b/qemu-io.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/readline.h"

#include "qemu/log.h"

#include "qapi/qmp/qstring.h"

+#include "qapi/qmp/qbool.h"

#include "qom/object_interfaces.h"

#include "sysemu/block-backend.h"

#include "block/block_int.h"

@@ -XXX,XX +XXX,XX @@ static const cmdinfo_t close_cmd = {

.oneline = "close the current open file",

};

-static int openfile(char *name, int flags, bool writethrough, QDict *opts)

+static int openfile(char *name, int flags, bool writethrough, bool force_share,

+ QDict *opts)

{

Error *local_err = NULL;

BlockDriverState *bs;

@@ -XXX,XX +XXX,XX @@ static int openfile(char *name, int flags, bool writethrough, QDict *opts)

return 1;

}

+ if (force_share) {

+ if (!opts) {

+ opts = qdict_new();

+ }

+ if (qdict_haskey(opts, BDRV_OPT_FORCE_SHARE)

+ && !qdict_get_bool(opts, BDRV_OPT_FORCE_SHARE)) {

+ error_report("-U conflicts with image options");

+ QDECREF(opts);

+ return 1;

+ }

+ qdict_put(opts, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));

+ }

qemuio_blk = blk_new_open(name, NULL, opts, flags, &local_err);

if (!qemuio_blk) {

error_reportf_err(local_err, "can't open%s%s: ",

@@ -XXX,XX +XXX,XX @@ static void open_help(void)

" -r, -- open file read-only\n"

" -s, -- use snapshot file\n"

" -n, -- disable host cache, short for -t none\n"

+" -U, -- force shared permissions\n"

" -k, -- use kernel AIO implementation (on Linux only)\n"

" -t, -- use the given cache mode for the image\n"

" -d, -- use the given discard mode for the image\n"

@@ -XXX,XX +XXX,XX @@ static const cmdinfo_t open_cmd = {

.argmin = 1,

.argmax = -1,

.flags = CMD_NOFILE_OK,

- .args = "[-rsnk] [-t cache] [-d discard] [-o options] [path]",

+ .args = "[-rsnkU] [-t cache] [-d discard] [-o options] [path]",

.oneline = "open the file specified by path",

.help = open_help,

};

@@ -XXX,XX +XXX,XX @@ static int open_f(BlockBackend *blk, int argc, char **argv)

int c;

QemuOpts *qopts;

QDict *opts;

+ bool force_share = false;

- while ((c = getopt(argc, argv, "snro:kt:d:")) != -1) {

+ while ((c = getopt(argc, argv, "snro:kt:d:U")) != -1) {

switch (c) {

case 's':

flags |= BDRV_O_SNAPSHOT;

@@ -XXX,XX +XXX,XX @@ static int open_f(BlockBackend *blk, int argc, char **argv)

return 0;

}

break;

+ case 'U':

+ force_share = true;

+ break;

default:

qemu_opts_reset(&empty_opts);

return qemuio_command_usage(&open_cmd);

@@ -XXX,XX +XXX,XX @@ static int open_f(BlockBackend *blk, int argc, char **argv)

qemu_opts_reset(&empty_opts);

if (optind == argc - 1) {

- return openfile(argv[optind], flags, writethrough, opts);

+ return openfile(argv[optind], flags, writethrough, force_share, opts);

} else if (optind == argc) {

- return openfile(NULL, flags, writethrough, opts);

+ return openfile(NULL, flags, writethrough, force_share, opts);

} else {

QDECREF(opts);

return qemuio_command_usage(&open_cmd);

@@ -XXX,XX +XXX,XX @@ static void usage(const char *name)

" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"

" specify tracing options\n"

" see qemu-img(1) man page for full description\n"

+" -U, --force-share force shared permissions\n"

" -h, --help display this help and exit\n"

" -V, --version output version information and exit\n"

"\n"

@@ -XXX,XX +XXX,XX @@ static QemuOptsList file_opts = {

int main(int argc, char **argv)

{

int readonly = 0;

- const char *sopt = "hVc:d:f:rsnmkt:T:";

+ const char *sopt = "hVc:d:f:rsnmkt:T:U";

const struct option lopt[] = {

{ "help", no_argument, NULL, 'h' },

{ "version", no_argument, NULL, 'V' },

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

{ "trace", required_argument, NULL, 'T' },

{ "object", required_argument, NULL, OPTION_OBJECT },

{ "image-opts", no_argument, NULL, OPTION_IMAGE_OPTS },

+ { "force-share", no_argument, 0, 'U'},

{ NULL, 0, NULL, 0 }

};

int c;

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

QDict *opts = NULL;

const char *format = NULL;

char *trace_file = NULL;

+ bool force_share = false;

#ifdef CONFIG_POSIX

signal(SIGPIPE, SIG_IGN);

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

case 'h':

usage(progname);

exit(0);

+ case 'U':

+ force_share = true;

+ break;

case OPTION_OBJECT: {

QemuOpts *qopts;

qopts = qemu_opts_parse_noisily(&qemu_object_opts,

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

exit(1);

}

opts = qemu_opts_to_qdict(qopts, NULL);

- if (openfile(NULL, flags, writethrough, opts)) {

+ if (openfile(NULL, flags, writethrough, force_share, opts)) {

exit(1);

}

} else {

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

opts = qdict_new();

qdict_put_str(opts, "driver", format);

}

- if (openfile(argv[optind], flags, writethrough, opts)) {

+ if (openfile(argv[optind], flags, writethrough,

+ force_share, opts)) {

exit(1);

}

}

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>

qemu-img and qemu-io commands when guest is running need "-U" option,

add it.

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

tests/qemu-iotests/030 | 18 +++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/030

+++ b/tests/qemu-iotests/030

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(iotests.QMPTestCase):

def test_stream_intermediate(self):

self.assert_no_active_block_jobs()

- self.assertNotEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img),

- qemu_io('-f', iotests.imgfmt, '-c', 'map', mid_img),

+ self.assertNotEqual(qemu_io('-f', 'raw', '-rU', '-c', 'map', backing_img),

+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', mid_img),

'image file map matches backing file before streaming')

result = self.vm.qmp('block-stream', device='mid', job_id='stream-mid')

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(iotests.QMPTestCase):

self.assert_no_active_block_jobs()

# The image map is empty before the operation

- empty_map = qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img)

+ empty_map = qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', test_img)

# This is a no-op: no data should ever be copied from the base image

result = self.vm.qmp('block-stream', device='drive0', base=mid_img)

@@ -XXX,XX +XXX,XX @@ class TestParallelOps(iotests.QMPTestCase):

# Check that the maps don't match before the streaming operations

for i in range(2, self.num_imgs, 2):

- self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', self.imgs[i]),

- qemu_io('-f', iotests.imgfmt, '-c', 'map', self.imgs[i-1]),

+ self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.imgs[i]),

+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.imgs[i-1]),

'image file map matches backing file before streaming')

# Create all streaming jobs

@@ -XXX,XX +XXX,XX @@ class TestParallelOps(iotests.QMPTestCase):

def test_stream_base_node_name(self):

self.assert_no_active_block_jobs()

- self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', self.imgs[4]),

- qemu_io('-f', iotests.imgfmt, '-c', 'map', self.imgs[3]),

+ self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.imgs[4]),

+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.imgs[3]),

'image file map matches backing file before streaming')

# Error: the base node does not exist

@@ -XXX,XX +XXX,XX @@ class TestQuorum(iotests.QMPTestCase):

if not iotests.supports_quorum():

return

- self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', self.children[0]),

- qemu_io('-f', iotests.imgfmt, '-c', 'map', self.backing[0]),

+ self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.children[0]),

+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.backing[0]),

'image file map matches backing file before streaming')

self.assert_no_active_block_jobs()

--

1.8.3.1

From: Fam Zheng <famz@redhat.com>