diff options
author | Anthony Liguori | 2010-09-08 21:26:57 +0200 |
---|---|---|
committer | Anthony Liguori | 2010-09-08 21:26:57 +0200 |
commit | aab2e8f79ad253c760787ff3ce4d64967fed0003 (patch) | |
tree | bc837d155b4d558b71ad196c561f9e71c10136d0 /nbd.h | |
parent | Merge remote branch 'mst/for_anthony' into staging (diff) | |
parent | qcow2: Remove unnecessary flush after L2 write (diff) | |
download | qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.gz qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.xz qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.zip |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'nbd.h')
-rw-r--r-- | nbd.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -42,6 +42,8 @@ enum { NBD_CMD_DISC = 2 }; +#define NBD_DEFAULT_PORT 10809 + size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read); int tcp_socket_outgoing(const char *address, uint16_t port); int tcp_socket_incoming(const char *address, uint16_t port); @@ -49,7 +51,8 @@ int unix_socket_outgoing(const char *path); int unix_socket_incoming(const char *path); int nbd_negotiate(int csock, off_t size); -int nbd_receive_negotiate(int csock, off_t *size, size_t *blocksize); +int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags, + off_t *size, size_t *blocksize); int nbd_init(int fd, int csock, off_t size, size_t blocksize); int nbd_send_request(int csock, struct nbd_request *request); int nbd_receive_reply(int csock, struct nbd_reply *reply); |