[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/12] ide scsi: Mess with geometry only for hard di
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 01/12] ide scsi: Mess with geometry only for hard disk devices |
Date: |
Mon, 6 Aug 2012 22:44:40 +0200 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/ide/qdev.c | 3 ++-
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;
}
--
1.7.6.5
- [Qemu-devel] [PULL 00/12] Block patches, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 01/12] ide scsi: Mess with geometry only for hard disk devices,
Kevin Wolf <=
- [Qemu-devel] [PATCH 02/12] qapi: generalize documentation of streaming commands, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 03/12] qemu-iotests: add qed.py image manipulation utility, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 04/12] docs: add dirty bit to qcow2 specification, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 05/12] qcow2: introduce dirty bit, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 06/12] docs: add lazy refcounts bit to qcow2 specification, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 07/12] qemu-iotests: ignore qemu-img create lazy_refcounts output, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 09/12] qemu-io: add "abort" command to simulate program crash, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 08/12] qcow2: implement lazy refcounts, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 11/12] qemu-iotests: Be more flexible with image creation options, Kevin Wolf, 2012/08/06