From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KE9iF-0001Vr-Q6
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 17:18:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KE9iF-0001VT-5h
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 17:18:03 -0400
Received: from [199.232.76.173] (port=48712 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KE9iF-0001VO-2X
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 17:18:03 -0400
Received: from savannah.gnu.org ([199.232.41.3]:51186 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ths@networkno.de>) id 1KE9iE-0003ul-NY
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 17:18:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <ths@networkno.de>) id 1KE9iD-0001Vh-K5
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 21:18:01 +0000
Received: from ths by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <ths@savannah.gnu.org>) id 1KE9iC-0001VA-S1
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 21:18:01 +0000
MIME-Version: 1.0
Errors-To: ths
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Thiemo Seufer <ths@networkno.de>
Message-Id: <E1KE9iC-0001VA-S1@cvs.savannah.gnu.org>
Date: Wed, 02 Jul 2008 21:18:00 +0000
Subject: [Qemu-devel] [4829] Cleanup qemu-nbd related code,
	by Laurent Vivier.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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
 
+@node qemu_nbd_invocation
+@subsection @code{qemu-nbd} Invocation
+
+@include 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;