Use NICInfo::model for eepro100 savevm ID string (Mark McLoughlin)

[qemu.git] / block-nbd.c

diff --git a/block-nbd.c b/block-nbd.c
index 88b61999fda8d6a4be0f4cc99201a01eaedabd65..632cb2dd2f7cdd4a8dd97de7be5ba4885e57644c 100644 (file)
--- a/block-nbd.c
+++ b/block-nbd.c
@@ -31,11 +31,6 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <pthread.h>
 
 typedef struct BDRVNBDState {
     int sock;
@@ -182,13 +177,12 @@ static int64_t nbd_getlength(BlockDriverState *bs)
 }
 
 BlockDriver bdrv_nbd = {
-    "nbd",
-    sizeof(BDRVNBDState),
-    NULL, /* no probe for protocols */
-    nbd_open,
-    nbd_read,
-    nbd_write,
-    nbd_close,
-    .bdrv_getlength = nbd_getlength,
-    .protocol_name = "nbd",
+    .format_name       = "nbd",
+    .instance_size     = sizeof(BDRVNBDState),
+    .bdrv_open         = nbd_open,
+    .bdrv_read         = nbd_read,
+    .bdrv_write                = nbd_write,
+    .bdrv_close                = nbd_close,
+    .bdrv_getlength    = nbd_getlength,
+    .protocol_name     = "nbd",
 };