Diff for /qemu/nbd.h between versions 1.1.1.5 and 1.1.1.6

version 1.1.1.5, 2018/04/24 18:55:52 version 1.1.1.6, 2018/04/24 19:16:55
Line 21 Line 21
   
 #include <sys/types.h>  #include <sys/types.h>
   
 #include <qemu-common.h>  #include "qemu-common.h"
   
 #include "block_int.h"  
   
 struct nbd_request {  struct nbd_request {
     uint32_t magic;      uint32_t magic;
Line 31  struct nbd_request { Line 29  struct nbd_request {
     uint64_t handle;      uint64_t handle;
     uint64_t from;      uint64_t from;
     uint32_t len;      uint32_t len;
 } __attribute__ ((__packed__));  } QEMU_PACKED;
   
 struct nbd_reply {  struct nbd_reply {
     uint32_t magic;      uint32_t magic;
     uint32_t error;      uint32_t error;
     uint64_t handle;      uint64_t handle;
 } __attribute__ ((__packed__));  } QEMU_PACKED;
   
   #define NBD_FLAG_HAS_FLAGS      (1 << 0)        /* Flags are there */
   #define NBD_FLAG_READ_ONLY      (1 << 1)        /* Device is read-only */
   #define NBD_FLAG_SEND_FLUSH     (1 << 2)        /* Send FLUSH */
   #define NBD_FLAG_SEND_FUA       (1 << 3)        /* Send FUA (Force Unit Access) */
   #define NBD_FLAG_ROTATIONAL     (1 << 4)        /* Use elevator algorithm - rotational media */
   #define NBD_FLAG_SEND_TRIM      (1 << 5)        /* Send TRIM (discard) */
   
   #define NBD_CMD_MASK_COMMAND    0x0000ffff
   #define NBD_CMD_FLAG_FUA        (1 << 16)
   
 enum {  enum {
     NBD_CMD_READ = 0,      NBD_CMD_READ = 0,
     NBD_CMD_WRITE = 1,      NBD_CMD_WRITE = 1,
     NBD_CMD_DISC = 2      NBD_CMD_DISC = 2,
       NBD_CMD_FLUSH = 3,
       NBD_CMD_TRIM = 4
 };  };
   
 #define NBD_DEFAULT_PORT        10809  #define NBD_DEFAULT_PORT        10809
Line 55  int tcp_socket_incoming_spec(const char  Line 65  int tcp_socket_incoming_spec(const char 
 int unix_socket_outgoing(const char *path);  int unix_socket_outgoing(const char *path);
 int unix_socket_incoming(const char *path);  int unix_socket_incoming(const char *path);
   
 int nbd_negotiate(int csock, off_t size);  int nbd_negotiate(int csock, off_t size, uint32_t flags);
 int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,  int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
                           off_t *size, size_t *blocksize);                            off_t *size, size_t *blocksize);
 int nbd_init(int fd, int csock, off_t size, size_t blocksize);  int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize);
 int nbd_send_request(int csock, struct nbd_request *request);  int nbd_send_request(int csock, struct nbd_request *request);
 int nbd_receive_reply(int csock, struct nbd_reply *reply);  int nbd_receive_reply(int csock, struct nbd_reply *reply);
 int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,  int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
              off_t *offset, bool readonly, uint8_t *data, int data_size);               off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size);
 int nbd_client(int fd);  int nbd_client(int fd);
 int nbd_disconnect(int fd);  int nbd_disconnect(int fd);
   

Removed from v.1.1.1.5  
changed lines
  Added in v.1.1.1.6


unix.superglobalmegacorp.com