Commit 952bc8b3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-01-21' into staging 



nbd patches for 2019-01-21

Add 'qemu-nbd --list' for probing a remote NBD server's advertisements.

- Eric Blake: 0/21 nbd: add qemu-nbd --list

# gpg: Signature made Mon 21 Jan 2019 22:44:27 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-2019-01-21: (21 commits)
  iotests: Enhance 223, 233 to cover 'qemu-nbd --list'
  nbd/client: Work around 3.0 bug for listing meta contexts
  qemu-nbd: Add --list option
  nbd/client: Add meta contexts to nbd_receive_export_list()
  nbd/client: Add nbd_receive_export_list()
  nbd/client: Refactor nbd_opt_go() to support NBD_OPT_INFO
  nbd/client: Pull out oldstyle size determination
  nbd/client: Split handshake into two functions
  nbd/client: Refactor return of nbd_receive_negotiate()
  nbd/client: Split out nbd_receive_one_meta_context()
  nbd/client: Split out nbd_send_meta_query()
  nbd/client: Change signature of nbd_negotiate_simple_meta_context()
  nbd/client: Move export name into NBDExportInfo
  nbd/client: Refactor nbd_receive_list()
  qemu-nbd: Avoid strtol open-coding
  nbd/server: Favor [u]int64_t over off_t
  nbd/server: Hoist length check to qmp_nbd_server_add
  qemu-nbd: Sanity check partition bounds
  qemu-nbd: Enhance man page
  maint: Allow for EXAMPLES in texi2pod
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 851aa0a5 ddd09448

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -860,6 +860,8 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ 
    docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \

	docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi



$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl



# Reports/Analysis



%/coverage-report.html:

block/nbd-client.c

+5 −4
Original line number Diff line number Diff line
@@ -249,11 +249,11 @@ static int nbd_parse_blockstatus_payload(NBDClientSession *client, 
    }



    context_id = payload_advance32(&payload);

    if (client->info.meta_base_allocation_id != context_id) {

    if (client->info.context_id != context_id) {

        error_setg(errp, "Protocol error: unexpected context id %d for "

                         "NBD_REPLY_TYPE_BLOCK_STATUS, when negotiated context "

                         "id is %d", context_id,

                         client->info.meta_base_allocation_id);

                         client->info.context_id);

        return -EINVAL;

    }
@@ -999,10 +999,11 @@ int nbd_client_init(BlockDriverState *bs, 
    client->info.structured_reply = true;

    client->info.base_allocation = true;

    client->info.x_dirty_bitmap = g_strdup(x_dirty_bitmap);

    ret = nbd_receive_negotiate(QIO_CHANNEL(sioc), export,

                                tlscreds, hostname,

    client->info.name = g_strdup(export ?: "");

    ret = nbd_receive_negotiate(QIO_CHANNEL(sioc), tlscreds, hostname,

                                &client->ioc, &client->info, errp);

    g_free(client->info.x_dirty_bitmap);

    g_free(client->info.name);

    if (ret < 0) {

        logout("Failed to negotiate with the NBD server\n");

        return ret;

blockdev-nbd.c

+9 −1
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ void qmp_nbd_server_add(const char *device, bool has_name, const char *name, 
    BlockDriverState *bs = NULL;

    BlockBackend *on_eject_blk;

    NBDExport *exp;

    int64_t len;



    if (!nbd_server) {

        error_setg(errp, "NBD server not running");
@@ -168,6 +169,13 @@ void qmp_nbd_server_add(const char *device, bool has_name, const char *name, 
        return;

    }



    len = bdrv_getlength(bs);

    if (len < 0) {

        error_setg_errno(errp, -len,

                         "Failed to determine the NBD export's length");

        return;

    }



    if (!has_writable) {

        writable = false;

    }
@@ -175,7 +183,7 @@ void qmp_nbd_server_add(const char *device, bool has_name, const char *name, 
        writable = false;

    }



    exp = nbd_export_new(bs, 0, -1, name, NULL, bitmap,

    exp = nbd_export_new(bs, 0, len, name, NULL, bitmap,

                         writable ? 0 : NBD_FLAG_READ_ONLY,

                         NULL, false, on_eject_blk, errp);

    if (!exp) {

include/block/nbd.h

+22 −9
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2016-2017 Red Hat, Inc.

 *  Copyright (C) 2016-2019 Red Hat, Inc.

 *  Copyright (C) 2005  Anthony Liguori <anthony@codemonkey.ws>

 *

 *  Network Block Device
@@ -263,25 +263,38 @@ struct NBDExportInfo { 
    bool request_sizes;

    char *x_dirty_bitmap;



    /* Set by client before nbd_receive_negotiate(), or by server results

     * during nbd_receive_export_list() */

    char *name; /* must be non-NULL */



    /* In-out fields, set by client before nbd_receive_negotiate() and

     * updated by server results during nbd_receive_negotiate() */

    bool structured_reply;

    bool base_allocation; /* base:allocation context for NBD_CMD_BLOCK_STATUS */



    /* Set by server results during nbd_receive_negotiate() */

    /* Set by server results during nbd_receive_negotiate() and

     * nbd_receive_export_list() */

    uint64_t size;

    uint16_t flags;

    uint32_t min_block;

    uint32_t opt_block;

    uint32_t max_block;



    uint32_t meta_base_allocation_id;

    uint32_t context_id;



    /* Set by server results during nbd_receive_export_list() */

    char *description;

    int n_contexts;

    char **contexts;

};

typedef struct NBDExportInfo NBDExportInfo;



int nbd_receive_negotiate(QIOChannel *ioc, const char *name,

                          QCryptoTLSCreds *tlscreds, const char *hostname,

                          QIOChannel **outioc, NBDExportInfo *info,

int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,

                          const char *hostname, QIOChannel **outioc,

                          NBDExportInfo *info, Error **errp);

void nbd_free_export_list(NBDExportInfo *info, int count);

int nbd_receive_export_list(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,

                            const char *hostname, NBDExportInfo **info,

                            Error **errp);

int nbd_init(int fd, QIOChannelSocket *sioc, NBDExportInfo *info,

             Error **errp);
@@ -294,8 +307,8 @@ int nbd_errno_to_system_errno(int err); 
typedef struct NBDExport NBDExport;

typedef struct NBDClient NBDClient;



NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, off_t size,

                          const char *name, const char *description,

NBDExport *nbd_export_new(BlockDriverState *bs, uint64_t dev_offset,

                          uint64_t size, const char *name, const char *desc,

                          const char *bitmap, uint16_t nbdflags,

                          void (*close)(NBDExport *), bool writethrough,

                          BlockBackend *on_eject_blk, Error **errp);

nbd/client.c

+542 −219

File changed.

Preview size limit exceeded, changes collapsed.