[Qemu-devel] [4829] Cleanup qemu-nbd related code, by Laurent Vivier.

[Thiemo Seufer]

Revision: 4829
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4829
Author:   ths
Date:     2008-07-02 21:18:00 +0000 (Wed, 02 Jul 2008)

Log Message:
-----------
Cleanup qemu-nbd related code, by Laurent Vivier.

Modified Paths:
--------------
    trunk/nbd.c
    trunk/qemu-doc.texi
    trunk/qemu-nbd.c

Modified: trunk/nbd.c
===================================================================
--- trunk/nbd.c 2008-07-02 21:16:22 UTC (rev 4828)
+++ trunk/nbd.c 2008-07-02 21:18:00 UTC (rev 4829)
@@ -388,8 +388,8 @@
        }
 
        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;
        }

Modified: trunk/qemu-doc.texi
===================================================================
--- trunk/qemu-doc.texi 2008-07-02 21:16:22 UTC (rev 4828)
+++ trunk/qemu-doc.texi 2008-07-02 21:18:00 UTC (rev 4829)
@@ -1318,6 +1318,7 @@
 * 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 @@
 
 @include qemu-img.texi
 
address@hidden qemu_nbd_invocation
address@hidden @code{qemu-nbd} Invocation
+
address@hidden qemu-nbd.texi
+
 @node host_drives
 @subsection Using host drives
 

Modified: trunk/qemu-nbd.c
===================================================================
--- trunk/qemu-nbd.c    2008-07-02 21:16:22 UTC (rev 4828)
+++ trunk/qemu-nbd.c    2008-07-02 21:18:00 UTC (rev 4829)
@@ -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 @@
         { "partition", 1, 0, 'P' },
         { "snapshot", 0, 0, 's' },
         { "verbose", 0, 0, 'v' },
+        { NULL, 0, 0, 0 }
     };
     int ch;
     int opt_ind = 0;