From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kk2RM-0004uU-PZ
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 16:00:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kk2RM-0004to-1i
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 16:00:24 -0400
Received: from [199.232.76.173] (port=55658 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kk2RL-0004tk-Ve
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 16:00:23 -0400
Received: from savannah.gnu.org ([199.232.41.3]:32942 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 <INVALID.NOREPLY@gnu.org>)
	id 1Kk2RL-0005eZ-AE
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 16:00:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Kk2RG-0007jN-3i
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 20:00:18 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1Kk2RF-0007hl-G3
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 20:00:17 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1Kk2RF-0007hl-G3@cvs.savannah.gnu.org>
Date: Sun, 28 Sep 2008 20:00:17 +0000
Subject: [Qemu-devel] [5340] Fix warning,
 based on patches by Zeev Tarantov and Jindrich Makovicka
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: 5340
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5340
Author:   blueswir1
Date:     2008-09-28 20:00:14 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
Fix warning, based on patches by Zeev Tarantov and Jindrich Makovicka

Modified Paths:
--------------
    trunk/block-vmdk.c

Modified: trunk/block-vmdk.c
===================================================================
--- trunk/block-vmdk.c	2008-09-28 18:55:17 UTC (rev 5339)
+++ trunk/block-vmdk.c	2008-09-28 20:00:14 UTC (rev 5340)
@@ -710,13 +710,13 @@
         "createType=\"monolithicSparse\"\n"
         "\n"
         "# Extent description\n"
-        "RW %lu SPARSE \"%s\"\n"
+        "RW %" PRId64 " SPARSE \"%s\"\n"
         "\n"
         "# The Disk Data Base \n"
         "#DDB\n"
         "\n"
         "ddb.virtualHWVersion = \"%d\"\n"
-        "ddb.geometry.cylinders = \"%lu\"\n"
+        "ddb.geometry.cylinders = \"%" PRId64 "\"\n"
         "ddb.geometry.heads = \"16\"\n"
         "ddb.geometry.sectors = \"63\"\n"
         "ddb.adapterType = \"ide\"\n";
@@ -792,8 +792,9 @@
     if ((temp_str = strrchr(real_filename, ':')) != NULL)
         real_filename = temp_str + 1;
     snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL),
-             (unsigned long)total_size, real_filename,
-             (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), total_size / (63 * 16));
+             total_size, real_filename,
+             (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
+             total_size / (int64_t)(63 * 16));
 
     /* write the descriptor */
     lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);