Commit 9225cd12 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-12-03' into staging 



nbd patches for 2018-12-03

Improve x-dirty-bitmap handling for experimenting with pull mode
incremental backups.

- Eric Blake: 0/3 NBD dirty bitmap cleanups

# gpg: Signature made Mon 03 Dec 2018 15:56:23 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2018-12-03:
  nbd/client: Send NBD_CMD_DISC if open fails after connect
  nbd/client: Make x-dirty-bitmap more reliable
  nbd/server: Advertise all contexts in response to bare LIST

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3af8c4be c688e6ca

block/nbd-client.c

+20 −1
Original line number Diff line number Diff line
@@ -992,10 +992,16 @@ int nbd_client_init(BlockDriverState *bs, 
        logout("Failed to negotiate with the NBD server\n");

        return ret;

    }

    if (x_dirty_bitmap && !client->info.base_allocation) {

        error_setg(errp, "requested x-dirty-bitmap %s not found",

                   x_dirty_bitmap);

        ret = -EINVAL;

        goto fail;

    }

    if (client->info.flags & NBD_FLAG_READ_ONLY) {

        ret = bdrv_apply_auto_read_only(bs, "NBD export is read-only", errp);

        if (ret < 0) {

            return ret;

            goto fail;

        }

    }

    if (client->info.flags & NBD_FLAG_SEND_FUA) {
@@ -1024,4 +1030,17 @@ int nbd_client_init(BlockDriverState *bs, 


    logout("Established connection with NBD server\n");

    return 0;



 fail:

    /*

     * We have connected, but must fail for other reasons. The

     * connection is still blocking; send NBD_CMD_DISC as a courtesy

     * to the server.

     */

    {

        NBDRequest request = { .type = NBD_CMD_DISC };



        nbd_send_request(client->ioc ?: QIO_CHANNEL(sioc), &request);

        return ret;

    }

}

nbd/server.c

+1 −0
Original line number Diff line number Diff line
@@ -978,6 +978,7 @@ static int nbd_negotiate_meta_queries(NBDClient *client, 
    if (client->opt == NBD_OPT_LIST_META_CONTEXT && !nb_queries) {

        /* enable all known contexts */

        meta->base_allocation = true;

        meta->bitmap = !!meta->exp->export_bitmap;

    } else {

        for (i = 0; i < nb_queries; ++i) {

            ret = nbd_negotiate_meta_query(client, meta, errp);