Commit 86f8cdf3 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

block/nbd: merge nbd-client.* to nbd.c 



No reason for keeping driver handlers realization separate from driver
structure. We can get rid of extra header file.

While being here, fix comments style, restore forgotten comments for
NBD_FOREACH_REPLY_CHUNK and nbd_reply_chunk_iter_receive, remove extra
includes.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20190611102720.86114-3-vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 0a93b359

block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ block-obj-y += null.o mirror.o commit.o io.o create.o 
block-obj-y += throttle-groups.o

block-obj-$(CONFIG_LINUX) += nvme.o



block-obj-y += nbd.o nbd-client.o

block-obj-y += nbd.o

block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o

block-obj-$(CONFIG_LIBISCSI) += iscsi.o

block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o

block/nbd-client.c

deleted100644 → 0
+0 −1226

File deleted.

Preview size limit exceeded, changes collapsed.

block/nbd-client.h

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
#ifndef NBD_CLIENT_H

#define NBD_CLIENT_H



#include "block/nbd.h"

#include "block/block_int.h"

#include "io/channel-socket.h"



#define MAX_NBD_REQUESTS    16



typedef struct {

    Coroutine *coroutine;

    uint64_t offset;        /* original offset of the request */

    bool receiving;         /* waiting for connection_co? */

} NBDClientRequest;



typedef struct NBDClientSession {

    QIOChannelSocket *sioc; /* The master data channel */

    QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) */

    NBDExportInfo info;



    CoMutex send_mutex;

    CoQueue free_sema;

    Coroutine *connection_co;

    int in_flight;



    NBDClientRequest requests[MAX_NBD_REQUESTS];

    NBDReply reply;

    BlockDriverState *bs;

    bool quit;

} NBDClientSession;



NBDClientSession *nbd_get_client_session(BlockDriverState *bs);



int nbd_client_init(BlockDriverState *bs,

                    SocketAddress *saddr,

                    const char *export_name,

                    QCryptoTLSCreds *tlscreds,

                    const char *hostname,

                    const char *x_dirty_bitmap,

                    Error **errp);

void nbd_client_close(BlockDriverState *bs);



int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes);

int nbd_client_co_flush(BlockDriverState *bs);

int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,

                          uint64_t bytes, QEMUIOVector *qiov, int flags);

int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,

                                int bytes, BdrvRequestFlags flags);

int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset,

                         uint64_t bytes, QEMUIOVector *qiov, int flags);



void nbd_client_detach_aio_context(BlockDriverState *bs);

void nbd_client_attach_aio_context(BlockDriverState *bs,

                                   AioContext *new_context);



int coroutine_fn nbd_client_co_block_status(BlockDriverState *bs,

                                            bool want_zero,

                                            int64_t offset, int64_t bytes,

                                            int64_t *pnum, int64_t *map,

                                            BlockDriverState **file);



#endif /* NBD_CLIENT_H */

block/nbd.c

+1253 −32

File changed.

Preview size limit exceeded, changes collapsed.

block/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p pa 
# iscsi.c

iscsi_xcopy(void *src_lun, uint64_t src_off, void *dst_lun, uint64_t dst_off, uint64_t bytes, int ret) "src_lun %p offset %"PRIu64" dst_lun %p offset %"PRIu64" bytes %"PRIu64" ret %d"



# nbd-client.c

# nbd.c

nbd_parse_blockstatus_compliance(const char *err) "ignoring extra data from non-compliant server: %s"

nbd_structured_read_compliance(const char *type) "server sent non-compliant unaligned read %s chunk"

nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s"