Cleanup qemu-nbd related code, by Laurent Vivier.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4829 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/nbd.c b/nbd.c
index c7d63d3..c138d36 100644 (file)
--- a/nbd.c
+++ b/nbd.c
@@ -388,8 +388,8 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, o
        }
 
        if (len > sizeof(data)) {
-               LOG("len (%u) is larger than max len (%u)",
-                   len, sizeof(data));
+               LOG("len (%u) is larger than max len (%lu)",
+                   len, (unsigned long)sizeof(data));
                errno = EINVAL;
                return -1;
        }

diff --git a/qemu-doc.texi b/qemu-doc.texi
index cda403f..3e53d88 100644 (file)
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -1318,6 +1318,7 @@ snapshots.
 * disk_images_snapshot_mode:: Snapshot mode
 * vm_snapshots::              VM snapshots
 * qemu_img_invocation::       qemu-img Invocation
+* qemu_nbd_invocation::       qemu-nbd Invocation
 * host_drives::               Using host drives
 * disk_images_fat_images::    Virtual FAT disk images
 @end menu
@@ -1400,6 +1401,11 @@ state is not saved or restored properly (in particular USB).
 
 @include qemu-img.texi
 
+@node qemu_nbd_invocation
+@subsection @code{qemu-nbd} Invocation
+
+@include qemu-nbd.texi
+
 @node host_drives
 @subsection Using host drives
 

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 3fb3d0c..0feafca 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -21,7 +21,6 @@
 #include "block_int.h"
 #include "nbd.h"
 
-#include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <getopt.h>
@@ -168,6 +167,7 @@ int main(int argc, char **argv)
         { "partition", 1, 0, 'P' },
         { "snapshot", 0, 0, 's' },
         { "verbose", 0, 0, 'v' },
+        { NULL, 0, 0, 0 }
     };
     int ch;
     int opt_ind = 0;