[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] fix sector overflow for scsi disks >1TB large
From: |
Rik van Riel |
Subject: |
[Qemu-devel] [PATCH] fix sector overflow for scsi disks >1TB large |
Date: |
Mon, 26 Jan 2009 17:42:09 -0500 |
Sector numbers can overflow on a virtual scsi disk of over 1TB
in size. Qemu's bdrv_read expects an int64_t, so fix the overflow
by going to that data type.
Also clip capacity to 2TB instead of returning "capacity modulo 2TB".
Signed-off-by: Rik van Riel <address@hidden>
Index: trunk/hw/scsi-disk.c
===================================================================
--- trunk/hw/scsi-disk.c (revision 6451)
+++ trunk/hw/scsi-disk.c (working copy)
@@ -50,7 +50,7 @@
/* ??? We should probably keep track of whether the data trasfer is
a read or a write. Currently we rely on the host getting it right. */
/* Both sector and sector_count are in terms of qemu 512 byte blocks. */
- int sector;
+ uint64_t sector;
int sector_count;
/* The amounnt of data in the buffer. */
int buf_len;
@@ -731,6 +731,9 @@
/* Returned value is the address of the last sector. */
if (nb_sectors) {
nb_sectors--;
+ /* Clip to 2TB, instead of returning capacity modulo 2TB. */
+ if (nb_sectors > UINT_MAX)
+ nb_sectors = UINT_MAX;
outbuf[0] = (nb_sectors >> 24) & 0xff;
outbuf[1] = (nb_sectors >> 16) & 0xff;
outbuf[2] = (nb_sectors >> 8) & 0xff;
- [Qemu-devel] [PATCH] fix sector overflow for scsi disks >1TB large,
Rik van Riel <=