diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-07 09:46:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-07 09:46:24 -0500 |
| commit | b262fce11a7409d71be84f68637cf4005e995822 (patch) | |
| tree | ab8fcdcd608718e38ce9772ccdc4f54cafa15b05 /hw/ide/qdev.c | |
| parent | 0b8db8fe15d17a529a5ea90614c11e9f031dfee8 (diff) | |
| parent | 20caf0f766b48fbbf718eb20aaddb7ffa356a21f (diff) | |
| download | focaccia-qemu-b262fce11a7409d71be84f68637cf4005e995822.tar.gz focaccia-qemu-b262fce11a7409d71be84f68637cf4005e995822.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function qemu-iotests: Be more flexible with image creation options qemu-iotests: add 039 qcow2 lazy refcounts test qemu-io: add "abort" command to simulate program crash qcow2: implement lazy refcounts qemu-iotests: ignore qemu-img create lazy_refcounts output docs: add lazy refcounts bit to qcow2 specification qcow2: introduce dirty bit docs: add dirty bit to qcow2 specification qemu-iotests: add qed.py image manipulation utility qapi: generalize documentation of streaming commands ide scsi: Mess with geometry only for hard disk devices
Diffstat (limited to 'hw/ide/qdev.c')
| -rw-r--r-- | hw/ide/qdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |