block/backup: make function variables consistently named

[qemu.git] / block / nbd-client.h

diff --git a/block/nbd-client.h b/block/nbd-client.h
index e8b3283382b6e5255ae7a3f018ed9973bf75d01d..cfc90550b9962c757b441b78db18fadb40ae3c9b 100644 (file)
--- a/block/nbd-client.h
+++ b/block/nbd-client.h
@@ -17,41 +17,55 @@
 
 #define MAX_NBD_REQUESTS    16
 
 
 #define MAX_NBD_REQUESTS    16
 

-typedef struct NbdClientSession {
+typedef struct {
+    Coroutine *coroutine;
+    uint64_t offset;        /* original offset of the request */
+    bool receiving;         /* waiting for read_reply_co? */
+} NBDClientRequest;
+
+typedef struct NBDClientSession {

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

-    uint32_t nbdflags;
-    off_t size;
+    NBDExportInfo info;

 
     CoMutex send_mutex;
 
     CoMutex send_mutex;

-    CoMutex free_sema;
-    Coroutine *send_coroutine;
+    CoQueue free_sema;
+    Coroutine *read_reply_co;

     int in_flight;
 
     int in_flight;
 

-    Coroutine *recv_coroutine[MAX_NBD_REQUESTS];
-    struct nbd_reply reply;
-
-    bool is_unix;
-} NbdClientSession;
+    NBDClientRequest requests[MAX_NBD_REQUESTS];
+    NBDReply reply;
+    bool quit;
+} NBDClientSession;

 
 

-NbdClientSession *nbd_get_client_session(BlockDriverState *bs);
+NBDClientSession *nbd_get_client_session(BlockDriverState *bs);

 
 int nbd_client_init(BlockDriverState *bs,
                     QIOChannelSocket *sock,
                     const char *export_name,
 
 int nbd_client_init(BlockDriverState *bs,
                     QIOChannelSocket *sock,
                     const char *export_name,

+                    QCryptoTLSCreds *tlscreds,
+                    const char *hostname,
+                    const char *x_dirty_bitmap,

                     Error **errp);
 void nbd_client_close(BlockDriverState *bs);
 
                     Error **errp);
 void nbd_client_close(BlockDriverState *bs);
 

-int nbd_client_co_discard(BlockDriverState *bs, int64_t sector_num,
-                          int nb_sectors);
+int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes);

 int nbd_client_co_flush(BlockDriverState *bs);
 int nbd_client_co_flush(BlockDriverState *bs);

-int nbd_client_co_writev(BlockDriverState *bs, int64_t sector_num,
-                         int nb_sectors, QEMUIOVector *qiov);
-int nbd_client_co_readv(BlockDriverState *bs, int64_t sector_num,
-                        int nb_sectors, QEMUIOVector *qiov);
+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);
 
 
 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 */
 #endif /* NBD_CLIENT_H */