From b2df431407a099ad2fe87a76188d12d99ab12841 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 12 Jul 2012 18:52:31 +0200 Subject: ide scsi: Mess with geometry only for hard disk devices 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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/ide/qdev.c') diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 22e58dfc8a..5ea9b8f4b2 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; } -- cgit v1.2.1