Commit 385e43e6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-11-19' into staging 



nbd patches for 2019-11-19

- iotests: more tests of NBD reconnect, various test output improvements
- nbd: fix spec compliance issue with long strings
- slience a Coverity warning on coroutines

# gpg: Signature made Tue 19 Nov 2019 03:06:41 GMT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2019-11-19:
  tests: More iotest 223 improvements
  iotests: Include QMP input in .out files
  iotests: Switch nbd tests to use Unix rather than TCP
  iotests: Fix 173
  MAINTAINERS: add more bitmap-related to Dirty Bitmaps section
  nbd: Don't send oversize strings
  bitmap: Enforce maximum bitmap name length
  nbd/server: Prefer heap over stack for parsing client names
  qemu-coroutine-sleep: Silence Coverity warning
  iotests: Test NBD client reconnection

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f086f22d 296416ff

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1869,6 +1869,8 @@ F: util/hbitmap.c 
F: block/dirty-bitmap.c

F: include/qemu/hbitmap.h

F: include/block/dirty-bitmap.h

F: qcow2-bitmap.c

F: migration/block-dirty-bitmap.c

F: tests/test-hbitmap.c

F: docs/interop/bitmaps.rst

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

block/dirty-bitmap.c

+9 −3
Original line number Diff line number Diff line
@@ -104,10 +104,16 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, 


    assert(is_power_of_2(granularity) && granularity >= BDRV_SECTOR_SIZE);



    if (name && bdrv_find_dirty_bitmap(bs, name)) {

    if (name) {

        if (bdrv_find_dirty_bitmap(bs, name)) {

            error_setg(errp, "Bitmap already exists: %s", name);

            return NULL;

        }

        if (strlen(name) > BDRV_BITMAP_MAX_NAME_SIZE) {

            error_setg(errp, "Bitmap name too long: %s", name);

            return NULL;

        }

    }

    bitmap_size = bdrv_getlength(bs);

    if (bitmap_size < 0) {

        error_setg_errno(errp, -bitmap_size, "could not get length of device");

block/nbd.c

+10 −0
Original line number Diff line number Diff line
@@ -1832,6 +1832,10 @@ static int nbd_process_options(BlockDriverState *bs, QDict *options, 
    }



    s->export = g_strdup(qemu_opt_get(opts, "export"));

    if (s->export && strlen(s->export) > NBD_MAX_STRING_SIZE) {

        error_setg(errp, "export name too long to send to server");

        goto error;

    }



    s->tlscredsid = g_strdup(qemu_opt_get(opts, "tls-creds"));

    if (s->tlscredsid) {
@@ -1849,6 +1853,11 @@ static int nbd_process_options(BlockDriverState *bs, QDict *options, 
    }



    s->x_dirty_bitmap = g_strdup(qemu_opt_get(opts, "x-dirty-bitmap"));

    if (s->x_dirty_bitmap && strlen(s->x_dirty_bitmap) > NBD_MAX_STRING_SIZE) {

        error_setg(errp, "x-dirty-bitmap query too long to send to server");

        goto error;

    }



    s->reconnect_delay = qemu_opt_get_number(opts, "reconnect-delay", 0);



    ret = 0;
@@ -1859,6 +1868,7 @@ static int nbd_process_options(BlockDriverState *bs, QDict *options, 
        qapi_free_SocketAddress(s->saddr);

        g_free(s->export);

        g_free(s->tlscredsid);

        g_free(s->x_dirty_bitmap);

    }

    qemu_opts_del(opts);

    return ret;

block/qcow2-bitmap.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#define BME_MIN_GRANULARITY_BITS 9

#define BME_MAX_NAME_SIZE 1023



QEMU_BUILD_BUG_ON(BME_MAX_NAME_SIZE != BDRV_BITMAP_MAX_NAME_SIZE);



#if BME_MAX_TABLE_SIZE * 8ULL > INT_MAX

#error In the code bitmap table physical size assumed to fit into int

#endif

blockdev-nbd.c

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ void qmp_nbd_server_add(const char *device, bool has_name, const char *name, 
        name = device;

    }



    if (strlen(name) > NBD_MAX_STRING_SIZE) {

        error_setg(errp, "export name '%s' too long", name);

        return;

    }



    if (nbd_export_find(name)) {

        error_setg(errp, "NBD server already has export named '%s'", name);

        return;