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 /hw/scsi-disk.c | |
| parent | 26b9b5fe17cc1b6be2e8bf8b9d16094f420bb8ad (diff) | |
| download | focaccia-qemu-b2df431407a099ad2fe87a76188d12d99ab12841.tar.gz focaccia-qemu-b2df431407a099ad2fe87a76188d12d99ab12841.zip | |
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>
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | hw/scsi-disk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a9c727905a..c8d5edd86e 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; } |