From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MM9QG-0005zb-NC
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 19:41:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MM9QC-0005z5-AV
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 19:41:04 -0400
Received: from [199.232.76.173] (port=51068 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MM9QC-0005z2-8a
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 19:41:00 -0400
Received: from pop-scotia.atl.sa.earthlink.net ([207.69.195.65]:54288)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <reif@earthlink.net>) id 1MM9QB-0008LF-Q3
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 19:40:59 -0400
Received: from user-142h2k8.cable.mindspring.com ([72.40.138.136]
	helo=[192.168.0.90])
	by pop-scotia.atl.sa.earthlink.net with esmtp (Exim 3.36 #1)
	id 1MM9QA-0003uP-00
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 19:40:58 -0400
Message-ID: <4A4BF3FB.90805@earthlink.net>
Date: Wed, 01 Jul 2009 19:40:43 -0400
From: Robert Reif <reif@earthlink.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------020804000409060903040806"
Subject: [Qemu-devel] [PATCH] fix hw/scsi-disk.c compile errors
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 <qemu-devel@nongnu.org>

This is a multi-part message in MIME format.
--------------020804000409060903040806
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 8bit

This patch fixes 2 compile errors when debugging is enabled.

CC scsi-disk.o
cc1: warnings being treated as errors
/home/reif/qemu/hw/scsi-disk.c: In function ‘scsi_send_command’:
/home/reif/qemu/hw/scsi-disk.c:797: error: format ‘%d’ expects type 
‘int’, but argument 2 has type ‘uint64_t’
/home/reif/qemu/hw/scsi-disk.c:899: error: format ‘%d’ expects type 
‘int’, but argument 2 has type ‘uint64_t’
make: *** [scsi-disk.o] Error 1

Signed-off-by: Robert Reif <reif@earthlink.net>

--------------020804000409060903040806
Content-Type: text/plain;
 name="scsi.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="scsi.diff.txt"

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index a0485db..95e484c 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -794,7 +794,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
         is_write = 1;
         break;
     case 0x35:
-        DPRINTF("Synchronise cache (sector %d, count %d)\n", lba, len);
+        DPRINTF("Synchronise cache (sector %lld, count %d)\n", lba, len);
         bdrv_flush(s->bdrv);
         break;
     case 0x43:
@@ -896,7 +896,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
         r->iov.iov_len = 16;
         break;
     case 0x2f:
-        DPRINTF("Verify (sector %d, count %d)\n", lba, len);
+        DPRINTF("Verify (sector %lld, count %d)\n", lba, len);
         break;
     default:
 	DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]);

--------------020804000409060903040806--