From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyUAc-0008BN-UG for qemu-devel@nongnu.org; Mon, 06 Aug 2012 16:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SyUAb-0004NF-NE for qemu-devel@nongnu.org; Mon, 06 Aug 2012 16:44:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyUAb-0004N3-FI for qemu-devel@nongnu.org; Mon, 06 Aug 2012 16:44:57 -0400 From: Kevin Wolf Date: Mon, 6 Aug 2012 22:44:40 +0200 Message-Id: <1344285891-6578-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1344285891-6578-1-git-send-email-kwolf@redhat.com> References: <1344285891-6578-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 01/12] ide scsi: Mess with geometry only for hard disk devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Legacy -drive cyls=... are now ignored completely when the drive doesn't back a hard disk device. Before, they were first checked against a hard disk's limits, then ignored. Signed-off-by: Markus Armbruster Acked-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/ide/qdev.c | 3 ++- hw/scsi-disk.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 22e58df..5ea9b8f 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -149,7 +149,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) } blkconf_serial(&dev->conf, &dev->serial); - if (blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) { + if (kind != IDE_CD + && blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) { return -1; } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a9c7279..c8d5edd 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1958,7 +1958,8 @@ static int scsi_initfn(SCSIDevice *dev) } blkconf_serial(&s->qdev.conf, &s->serial); - if (blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) { + if (dev->type == TYPE_DISK + && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) { return -1; } -- 1.7.6.5