diff options
| author | Shmulik Ladkani | 2016-01-25 20:34:40 +0100 |
|---|---|---|
| committer | John Snow | 2016-01-25 20:34:40 +0100 |
| commit | 4f0869948201af740114fed4468165cf927614fa (patch) | |
| tree | da53be24a4b400f1a81d88793bfa9f161b70b413 /hw/ide/qdev.c | |
| parent | Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160125' into staging (diff) | |
| download | qemu-4f0869948201af740114fed4468165cf927614fa.tar.gz qemu-4f0869948201af740114fed4468165cf927614fa.tar.xz qemu-4f0869948201af740114fed4468165cf927614fa.zip | |
ide: Correct the CHS 'cyls_max' limit to be 65535
In b7eb0c9:
hw/block-common: Factor out fall back to legacy -drive cyls=...
'blkconf_geometry()' was introduced, factoring out CHS limit validation
code that was repeated in ide, scsi, virtio-blk.
The original IDE CHS limit prior b7eb0c9 was 65535,16,255 (as per ATA
CHS addressing).
However the 'cyls_max' argument passed to 'blkconf_geometry' in the
ide_dev_initfn case was accidentally set to 65536 instead of 65535.
Fix, providing the correct 'cyls_max'.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 1453112371-29760-1-git-send-email-shmulik.ladkani@ravellosystems.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw/ide/qdev.c')
| -rw-r--r-- | hw/ide/qdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 1f831098c7..fea54256ad 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -172,7 +172,7 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) blkconf_serial(&dev->conf, &dev->serial); if (kind != IDE_CD) { - blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255, &err); + blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255, &err); if (err) { error_report_err(err); return -1; |