omap1: convert to memory API (part I)

[qemu.git] / nbd.h

diff --git a/nbd.h b/nbd.h
index b38d0d08de2d80bdf545251f8b02921234b973c5..df7b7af7c0888d027523f4535bdd9d96fe882efe 100644 (file)
--- a/nbd.h
+++ b/nbd.h
@@ -21,9 +21,7 @@
 
 #include <sys/types.h>
 
-#include <qemu-common.h>
-
-#include "block_int.h"
+#include "qemu-common.h"
 
 struct nbd_request {
     uint32_t magic;
@@ -31,13 +29,13 @@ struct nbd_request {
     uint64_t handle;
     uint64_t from;
     uint32_t len;
-} __attribute__ ((__packed__));
+} QEMU_PACKED;
 
 struct nbd_reply {
     uint32_t magic;
     uint32_t error;
     uint64_t handle;
-} __attribute__ ((__packed__));
+} QEMU_PACKED;
 
 enum {
     NBD_CMD_READ = 0,