diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-07-12 18:52:31 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-08-06 22:39:14 +0200 |
| commit | b2df431407a099ad2fe87a76188d12d99ab12841 (patch) | |
| tree | 7ca72f1216b4ae970fd903aeddc99c448e58c565 | |
| parent | 26b9b5fe17cc1b6be2e8bf8b9d16094f420bb8ad (diff) | |
| download | qemu-b2df431407a099ad2fe87a76188d12d99ab12841.zip qemu-b2df431407a099ad2fe87a76188d12d99ab12841.tar.gz qemu-b2df431407a099ad2fe87a76188d12d99ab12841.tar.bz2 | |
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 <armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/ide/qdev.c | 3 | ||||
| -rw-r--r-- | 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; } |