Commit adf2e451 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- Block graph change fixes (avoid loops, cope with non-tree graphs)
- bdrv_set_aio_context() related fixes
- HMP snapshot commands: Use only tag, not the ID to identify snapshots
- qmeu-img, commit: Error path fixes
- block/nvme: Build fix for gcc 9
- MAINTAINERS updates
- Fix various issues with bdrv_refresh_filename()
- Fix various iotests
- Include LUKS overhead in qemu-img measure for qcow2
- A fix for vmdk's image creation interface

# gpg: Signature made Mon 25 Feb 2019 14:18:15 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (71 commits)
  iotests: Skip 211 on insufficient memory
  vmdk: false positive of compat6 with hwversion not set
  iotests: add LUKS payload overhead to 178 qemu-img measure test
  qcow2: include LUKS payload overhead in qemu-img measure
  iotests.py: s/_/-/g on keys in qmp_log()
  iotests: Let 045 be run concurrently
  iotests: Filter SSH paths
  iotests.py: Filter filename in any string value
  iotests.py: Add is_str()
  iotests: Fix 207 to use QMP filters for qmp_log
  iotests: Fix 232 for LUKS
  iotests: Remove superfluous rm from 232
  iotests: Fix 237 for Python 2.x
  iotests: Re-add filename filters
  iotests: Test json:{} filenames of internal BDSs
  block: BDS options may lack the "driver" option
  block/null: Generate filename even with latency-ns
  block/curl: Implement bdrv_refresh_filename()
  block/curl: Harmonize option defaults
  block/nvme: Fix bdrv_refresh_filename()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 86c7e2f4 1b967e9f

MAINTAINERS

+5 −17
Original line number Diff line number Diff line
@@ -1698,7 +1698,7 @@ F: include/scsi/* 
F: scsi/*



Block Jobs

M: Jeff Cody <jcody@redhat.com>

M: John Snow <jsnow@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: blockjob.c
@@ -1711,7 +1711,7 @@ F: block/commit.c 
F: block/stream.c

F: block/mirror.c

F: qapi/job.json

T: git https://github.com/codyprime/qemu-kvm-jtc.git block

T: git https://github.com/jnsnow/qemu.git jobs



Block QAPI, monitor, command line

M: Markus Armbruster <armbru@redhat.com>
@@ -2261,26 +2261,22 @@ F: block/vmdk.c 


RBD

M: Josh Durgin <jdurgin@redhat.com>

M: Jeff Cody <jcody@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: block/rbd.c

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



Sheepdog

M: Liu Yuan <namei.unix@gmail.com>

M: Jeff Cody <jcody@redhat.com>

L: qemu-block@nongnu.org

S: Supported

L: sheepdog@lists.wpkg.org

S: Odd Fixes

F: block/sheepdog.c

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



VHDX

M: Jeff Cody <jcody@redhat.com>

M: Jeff Cody <codyprime@gmail.com>

L: qemu-block@nongnu.org

S: Supported

F: block/vhdx*

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



VDI

M: Stefan Weil <sw@weilnetz.de>
@@ -2310,34 +2306,26 @@ F: docs/interop/nbd.txt 
T: git https://repo.or.cz/qemu/ericb.git nbd



NFS

M: Jeff Cody <jcody@redhat.com>

M: Peter Lieven <pl@kamp.de>

L: qemu-block@nongnu.org

S: Maintained

F: block/nfs.c

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



SSH

M: Richard W.M. Jones <rjones@redhat.com>

M: Jeff Cody <jcody@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: block/ssh.c

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



CURL

M: Jeff Cody <jcody@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: block/curl.c

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



GLUSTER

M: Jeff Cody <jcody@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: block/gluster.c

T: git https://github.com/codyprime/qemu-kvm-jtc.git block



Null Block Driver

M: Fam Zheng <fam@euphon.net>

block.c

+410 −187

File changed.

Preview size limit exceeded, changes collapsed.

block/blkdebug.c

+36 −34
Original line number Diff line number Diff line
@@ -811,53 +811,39 @@ static int64_t blkdebug_getlength(BlockDriverState *bs) 
    return bdrv_getlength(bs->file->bs);

}



static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)

static void blkdebug_refresh_filename(BlockDriverState *bs)

{

    BDRVBlkdebugState *s = bs->opaque;

    QDict *opts;

    const QDictEntry *e;

    bool force_json = false;

    int ret;



    for (e = qdict_first(options); e; e = qdict_next(options, e)) {

        if (strcmp(qdict_entry_key(e), "config") &&

            strcmp(qdict_entry_key(e), "x-image"))

        {

            force_json = true;

            break;

        }

    if (!bs->file->bs->exact_filename[0]) {

        return;

    }



    if (force_json && !bs->file->bs->full_open_options) {

        /* The config file cannot be recreated, so creating a plain filename

         * is impossible */

    for (e = qdict_first(bs->full_open_options); e;

         e = qdict_next(bs->full_open_options, e))

    {

        /* Real child options are under "image", but "x-image" may

         * contain a filename */

        if (strcmp(qdict_entry_key(e), "config") &&

            strcmp(qdict_entry_key(e), "image") &&

            strcmp(qdict_entry_key(e), "x-image") &&

            strcmp(qdict_entry_key(e), "driver"))

        {

            return;

        }

    }



    if (!force_json && bs->file->bs->exact_filename[0]) {

        int ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),

                           "blkdebug:%s:%s", s->config_file ?: "",

                           bs->file->bs->exact_filename);

    ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),

                   "blkdebug:%s:%s",

                   s->config_file ?: "", bs->file->bs->exact_filename);

    if (ret >= sizeof(bs->exact_filename)) {

        /* An overflow makes the filename unusable, so do not report any */

        bs->exact_filename[0] = 0;

    }

}



    opts = qdict_new();

    qdict_put_str(opts, "driver", "blkdebug");



    qdict_put(opts, "image", qobject_ref(bs->file->bs->full_open_options));



    for (e = qdict_first(options); e; e = qdict_next(options, e)) {

        if (strcmp(qdict_entry_key(e), "x-image")) {

            qdict_put_obj(opts, qdict_entry_key(e),

                          qobject_ref(qdict_entry_value(e)));

        }

    }



    bs->full_open_options = opts;

}



static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp)

{

    BDRVBlkdebugState *s = bs->opaque;
@@ -888,6 +874,20 @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state, 
    return 0;

}



static const char *const blkdebug_strong_runtime_opts[] = {

    "config",

    "inject-error.",

    "set-state.",

    "align",

    "max-transfer",

    "opt-write-zero",

    "max-write-zero",

    "opt-discard",

    "max-discard",



    NULL

};



static BlockDriver bdrv_blkdebug = {

    .format_name            = "blkdebug",

    .protocol_name          = "blkdebug",
@@ -917,6 +917,8 @@ static BlockDriver bdrv_blkdebug = { 
                                = blkdebug_debug_remove_breakpoint,

    .bdrv_debug_resume          = blkdebug_debug_resume,

    .bdrv_debug_is_suspended    = blkdebug_debug_is_suspended,



    .strong_runtime_opts        = blkdebug_strong_runtime_opts,

};



static void bdrv_blkdebug_init(void)

block/blklogwrites.c

+8 −25
Original line number Diff line number Diff line
@@ -280,30 +280,6 @@ static int64_t blk_log_writes_getlength(BlockDriverState *bs) 
    return bdrv_getlength(bs->file->bs);

}



static void blk_log_writes_refresh_filename(BlockDriverState *bs,

                                            QDict *options)

{

    BDRVBlkLogWritesState *s = bs->opaque;



    /* bs->file->bs has already been refreshed */

    bdrv_refresh_filename(s->log_file->bs);



    if (bs->file->bs->full_open_options

        && s->log_file->bs->full_open_options)

    {

        QDict *opts = qdict_new();

        qdict_put_str(opts, "driver", "blklogwrites");



        qobject_ref(bs->file->bs->full_open_options);

        qdict_put(opts, "file", bs->file->bs->full_open_options);

        qobject_ref(s->log_file->bs->full_open_options);

        qdict_put(opts, "log", s->log_file->bs->full_open_options);

        qdict_put_int(opts, "log-sector-size", s->sectorsize);



        bs->full_open_options = opts;

    }

}



static void blk_log_writes_child_perm(BlockDriverState *bs, BdrvChild *c,

                                      const BdrvChildRole *role,

                                      BlockReopenQueue *ro_q,
@@ -520,6 +496,13 @@ blk_log_writes_co_pdiscard(BlockDriverState *bs, int64_t offset, int count) 
                                 LOG_DISCARD_FLAG, false);

}



static const char *const blk_log_writes_strong_runtime_opts[] = {

    "log-append",

    "log-sector-size",



    NULL

};



static BlockDriver bdrv_blk_log_writes = {

    .format_name            = "blklogwrites",

    .instance_size          = sizeof(BDRVBlkLogWritesState),
@@ -527,7 +510,6 @@ static BlockDriver bdrv_blk_log_writes = { 
    .bdrv_open              = blk_log_writes_open,

    .bdrv_close             = blk_log_writes_close,

    .bdrv_getlength         = blk_log_writes_getlength,

    .bdrv_refresh_filename  = blk_log_writes_refresh_filename,

    .bdrv_child_perm        = blk_log_writes_child_perm,

    .bdrv_refresh_limits    = blk_log_writes_refresh_limits,
@@ -539,6 +521,7 @@ static BlockDriver bdrv_blk_log_writes = { 
    .bdrv_co_block_status   = bdrv_co_block_status_from_file,



    .is_filter              = true,

    .strong_runtime_opts    = blk_log_writes_strong_runtime_opts,

};



static void bdrv_blk_log_writes_init(void)

block/blkverify.c

+11 −18
Original line number Diff line number Diff line
@@ -281,27 +281,10 @@ static bool blkverify_recurse_is_first_non_filter(BlockDriverState *bs, 
    return bdrv_recurse_is_first_non_filter(s->test_file->bs, candidate);

}



static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)

static void blkverify_refresh_filename(BlockDriverState *bs)

{

    BDRVBlkverifyState *s = bs->opaque;



    /* bs->file->bs has already been refreshed */

    bdrv_refresh_filename(s->test_file->bs);



    if (bs->file->bs->full_open_options

        && s->test_file->bs->full_open_options)

    {

        QDict *opts = qdict_new();

        qdict_put_str(opts, "driver", "blkverify");



        qdict_put(opts, "raw",

                  qobject_ref(bs->file->bs->full_open_options));

        qdict_put(opts, "test",

                  qobject_ref(s->test_file->bs->full_open_options));



        bs->full_open_options = opts;

    }



    if (bs->file->bs->exact_filename[0]

        && s->test_file->bs->exact_filename[0])

    {
@@ -316,6 +299,15 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options) 
    }

}



static char *blkverify_dirname(BlockDriverState *bs, Error **errp)

{

    /* In general, there are two BDSs with different dirnames below this one;

     * so there is no unique dirname we could return (unless both are equal by

     * chance). Therefore, to be consistent, just always return NULL. */

    error_setg(errp, "Cannot generate a base directory for blkverify nodes");

    return NULL;

}



static BlockDriver bdrv_blkverify = {

    .format_name                      = "blkverify",

    .protocol_name                    = "blkverify",
@@ -327,6 +319,7 @@ static BlockDriver bdrv_blkverify = { 
    .bdrv_child_perm                  = bdrv_filter_default_perms,

    .bdrv_getlength                   = blkverify_getlength,

    .bdrv_refresh_filename            = blkverify_refresh_filename,

    .bdrv_dirname                     = blkverify_dirname,



    .bdrv_co_preadv                   = blkverify_co_preadv,

    .bdrv_co_pwritev                  = blkverify_co_pwritev,