Commit 0748b352 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging 



Block layer patches

# gpg: Signature made Mon 29 May 2017 03:34:59 PM BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* kwolf/tags/for-upstream:
  block/file-*: *_parse_filename() and colons
  block: Fix backing paths for filenames with colons
  block: Tweak error message related to qemu-img amend
  qemu-img: Fix leakage of options on error
  qemu-img: copy *key-secret opts when opening newly created files
  qemu-img: introduce --target-image-opts for 'convert' command
  qemu-img: fix --image-opts usage with dd command
  qemu-img: add support for --object with 'dd' command
  qemu-img: Fix documentation of convert
  qcow2: remove extra local_error variable
  mirror: Drop permissions on s->target on completion
  nvme: Add support for Controller Memory Buffers
  iotests: 147: Don't test inet6 if not available
  qemu-iotests: Test streaming with missing job ID
  stream: fix crash in stream_start() when block_job_create() fails

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 697e42de 42a48128

block.c

+45 −5
Original line number Diff line number Diff line
@@ -163,11 +163,16 @@ void path_combine(char *dest, int dest_size, 
    if (path_is_absolute(filename)) {

        pstrcpy(dest, dest_size, filename);

    } else {

        p = strchr(base_path, ':');

        if (p)

            p++;

        else

            p = base_path;

        const char *protocol_stripped = NULL;



        if (path_has_protocol(base_path)) {

            protocol_stripped = strchr(base_path, ':');

            if (protocol_stripped) {

                protocol_stripped++;

            }

        }

        p = protocol_stripped ?: base_path;



        p1 = strrchr(base_path, '/');

#ifdef _WIN32

        {
@@ -192,6 +197,41 @@ void path_combine(char *dest, int dest_size, 
    }

}



/*

 * Helper function for bdrv_parse_filename() implementations to remove optional

 * protocol prefixes (especially "file:") from a filename and for putting the

 * stripped filename into the options QDict if there is such a prefix.

 */

void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,

                                      QDict *options)

{

    if (strstart(filename, prefix, &filename)) {

        /* Stripping the explicit protocol prefix may result in a protocol

         * prefix being (wrongly) detected (if the filename contains a colon) */

        if (path_has_protocol(filename)) {

            QString *fat_filename;



            /* This means there is some colon before the first slash; therefore,

             * this cannot be an absolute path */

            assert(!path_is_absolute(filename));



            /* And we can thus fix the protocol detection issue by prefixing it

             * by "./" */

            fat_filename = qstring_from_str("./");

            qstring_append(fat_filename, filename);



            assert(!path_has_protocol(qstring_get_str(fat_filename)));



            qdict_put(options, "filename", fat_filename);

        } else {

            /* If no protocol prefix was detected, we can use the shortened

             * filename as-is */

            qdict_put_str(options, "filename", filename);

        }

    }

}





/* Returns whether the image file is opened as read-only. Note that this can

 * return false and writing to the image file is still not possible because the

 * image is inactivated. */

block/file-posix.c

+3 −14
Original line number Diff line number Diff line
@@ -381,12 +381,7 @@ static void raw_parse_flags(int bdrv_flags, int *open_flags) 
static void raw_parse_filename(const char *filename, QDict *options,

                               Error **errp)

{

    /* The filename does not have to be prefixed by the protocol name, since

     * "file" is the default protocol; therefore, the return value of this

     * function call can be ignored. */

    strstart(filename, "file:", &filename);



    qdict_put_str(options, "filename", filename);

    bdrv_parse_filename_strip_prefix(filename, "file:", options);

}



static QemuOptsList raw_runtime_opts = {
@@ -2395,10 +2390,7 @@ static int check_hdev_writable(BDRVRawState *s) 
static void hdev_parse_filename(const char *filename, QDict *options,

                                Error **errp)

{

    /* The prefix is optional, just as for "file". */

    strstart(filename, "host_device:", &filename);



    qdict_put_str(options, "filename", filename);

    bdrv_parse_filename_strip_prefix(filename, "host_device:", options);

}



static bool hdev_is_sg(BlockDriverState *bs)
@@ -2697,10 +2689,7 @@ static BlockDriver bdrv_host_device = { 
static void cdrom_parse_filename(const char *filename, QDict *options,

                                 Error **errp)

{

    /* The prefix is optional, just as for "file". */

    strstart(filename, "host_cdrom:", &filename);



    qdict_put_str(options, "filename", filename);

    bdrv_parse_filename_strip_prefix(filename, "host_cdrom:", options);

}

#endif

block/file-win32.c

+2 −10
Original line number Diff line number Diff line
@@ -276,12 +276,7 @@ static void raw_parse_flags(int flags, bool use_aio, int *access_flags, 
static void raw_parse_filename(const char *filename, QDict *options,

                               Error **errp)

{

    /* The filename does not have to be prefixed by the protocol name, since

     * "file" is the default protocol; therefore, the return value of this

     * function call can be ignored. */

    strstart(filename, "file:", &filename);



    qdict_put_str(options, "filename", filename);

    bdrv_parse_filename_strip_prefix(filename, "file:", options);

}



static QemuOptsList raw_runtime_opts = {
@@ -671,10 +666,7 @@ static int hdev_probe_device(const char *filename) 
static void hdev_parse_filename(const char *filename, QDict *options,

                                Error **errp)

{

    /* The prefix is optional, just as for "file". */

    strstart(filename, "host_device:", &filename);



    qdict_put_str(options, "filename", filename);

    bdrv_parse_filename_strip_prefix(filename, "host_device:", options);

}



static int hdev_open(BlockDriverState *bs, QDict *options, int flags,

block/mirror.c

+6 −1
Original line number Diff line number Diff line
@@ -514,7 +514,12 @@ static void mirror_exit(BlockJob *job, void *opaque) 


    /* Remove target parent that still uses BLK_PERM_WRITE/RESIZE before

     * inserting target_bs at s->to_replace, where we might not be able to get

     * these permissions. */

     * these permissions.

     *

     * Note that blk_unref() alone doesn't necessarily drop permissions because

     * we might be running nested inside mirror_drain(), which takes an extra

     * reference, so use an explicit blk_set_perm() first. */

    blk_set_perm(s->target, 0, BLK_PERM_ALL, &error_abort);

    blk_unref(s->target);

    s->target = NULL;

block/qcow2-cluster.c

+2 −1
Original line number Diff line number Diff line
@@ -1797,7 +1797,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, 
            }



            if (offset_into_cluster(s, offset)) {

                qcow2_signal_corruption(bs, true, -1, -1, "Data cluster offset "

                qcow2_signal_corruption(bs, true, -1, -1,

                                        "Cluster allocation offset "

                                        "%#" PRIx64 " unaligned (L2 offset: %#"

                                        PRIx64 ", L2 index: %#x)", offset,

                                        l2_offset, j);