omap1: convert to memory API (part I)

[qemu.git] / nbd.h

diff --git a/nbd.h b/nbd.h
index fc3a5944f4a6b10fad89dd0c5e59b7b5135cf639..df7b7af7c0888d027523f4535bdd9d96fe882efe 100644 (file)
--- a/nbd.h
+++ b/nbd.h
@@ -21,20 +21,21 @@
 
 #include <sys/types.h>
 
-#include <qemu-common.h>
-#include "block_int.h"
+#include "qemu-common.h"
 
 struct nbd_request {
+    uint32_t magic;
     uint32_t type;
     uint64_t handle;
     uint64_t from;
     uint32_t len;
-};
+} QEMU_PACKED;
 
 struct nbd_reply {
+    uint32_t magic;
     uint32_t error;
     uint64_t handle;
-};
+} QEMU_PACKED;
 
 enum {
     NBD_CMD_READ = 0,
@@ -47,6 +48,8 @@ enum {
 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);
+int tcp_socket_outgoing_spec(const char *address_and_port);
+int tcp_socket_incoming_spec(const char *address_and_port);
 int unix_socket_outgoing(const char *path);
 int unix_socket_incoming(const char *path);