[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/32] hd-geometry: Cut out block layer translation
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 14/32] hd-geometry: Cut out block layer translation middleman |
Date: |
Fri, 29 Jun 2012 17:34:36 +0200 |
hd_geometry_guess() picks geometry and translation. Callers can get
the geometry directly, via parameters, but for translation they need
to go through the block layer.
Add a parameter for translation, so it can optionally be gotten just
like geometry. In preparation of purging translation from the block
layer, which will happen later in this series.
Signed-off-by: Markus Armbruster <address@hidden>
---
blockdev.h | 3 ++-
hw/hd-geometry.c | 20 ++++++++++++++------
hw/ide/core.c | 2 +-
hw/scsi-disk.c | 4 ++--
hw/virtio-blk.c | 2 +-
5 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/blockdev.h b/blockdev.h
index 7b05945..214f239 100644
--- a/blockdev.h
+++ b/blockdev.h
@@ -65,6 +65,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject
**ret_data);
/* Hard disk geometry */
void hd_geometry_guess(BlockDriverState *bs,
- int *pcyls, int *pheads, int *psecs);
+ int *pcyls, int *pheads, int *psecs,
+ int *ptrans);
#endif
diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c
index eaccbe9..208cb42 100644
--- a/hw/hd-geometry.c
+++ b/hw/hd-geometry.c
@@ -108,7 +108,8 @@ static void guess_chs_for_size(BlockDriverState *bs,
}
void hd_geometry_guess(BlockDriverState *bs,
- int *pcyls, int *pheads, int *psecs)
+ int *pcyls, int *pheads, int *psecs,
+ int *ptrans)
{
int cylinders, heads, secs, translation;
@@ -120,6 +121,9 @@ void hd_geometry_guess(BlockDriverState *bs,
*pcyls = cylinders;
*pheads = heads;
*psecs = secs;
+ if (ptrans) {
+ *ptrans = translation;
+ }
return;
}
@@ -133,10 +137,10 @@ void hd_geometry_guess(BlockDriverState *bs,
translation was active, so a standard physical disk
geometry is OK */
guess_chs_for_size(bs, pcyls, pheads, psecs);
- bdrv_set_translation_hint(bs,
- *pcyls * *pheads <= 131072
- ? BIOS_ATA_TRANSLATION_LARGE
- : BIOS_ATA_TRANSLATION_LBA);
+ translation = *pcyls * *pheads <= 131072
+ ? BIOS_ATA_TRANSLATION_LARGE
+ : BIOS_ATA_TRANSLATION_LBA;
+ bdrv_set_translation_hint(bs, translation);
} else {
/* LCHS guess with heads <= 16: use as physical geometry */
*pcyls = cylinders;
@@ -144,7 +148,11 @@ void hd_geometry_guess(BlockDriverState *bs,
*psecs = secs;
/* disable any translation to be in sync with
the logical geometry */
- bdrv_set_translation_hint(bs, BIOS_ATA_TRANSLATION_NONE);
+ translation = BIOS_ATA_TRANSLATION_NONE;
+ bdrv_set_translation_hint(bs, translation);
+ }
+ if (ptrans) {
+ *ptrans = translation;
}
bdrv_set_geometry_hint(bs, *pcyls, *pheads, *psecs);
trace_hd_geometry_guess(bs, *pcyls, *pheads, *psecs, translation);
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 00ee280..03a4f4f 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1933,7 +1933,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs,
IDEDriveKind kind,
s->drive_kind = kind;
bdrv_get_geometry(bs, &nb_sectors);
- hd_geometry_guess(bs, &cylinders, &heads, &secs);
+ hd_geometry_guess(bs, &cylinders, &heads, &secs, NULL);
if (cylinders < 1 || cylinders > 16383) {
error_report("cyls must be between 1 and 16383");
return -1;
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 47e1246..7a75e15 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -948,7 +948,7 @@ static int mode_sense_page(SCSIDiskState *s, int page,
uint8_t **p_outbuf,
break;
}
/* if a geometry hint is available, use it */
- hd_geometry_guess(bdrv, &cylinders, &heads, &secs);
+ hd_geometry_guess(bdrv, &cylinders, &heads, &secs, NULL);
p[2] = (cylinders >> 16) & 0xff;
p[3] = (cylinders >> 8) & 0xff;
p[4] = cylinders & 0xff;
@@ -982,7 +982,7 @@ static int mode_sense_page(SCSIDiskState *s, int page,
uint8_t **p_outbuf,
p[2] = 5000 >> 8;
p[3] = 5000 & 0xff;
/* if a geometry hint is available, use it */
- hd_geometry_guess(bdrv, &cylinders, &heads, &secs);
+ hd_geometry_guess(bdrv, &cylinders, &heads, &secs, NULL);
p[4] = heads & 0xff;
p[5] = secs & 0xff;
p[6] = s->qdev.blocksize >> 8;
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index c976749..e4f9906 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -622,7 +622,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev,
VirtIOBlkConf *blk)
s->blk = blk;
s->rq = NULL;
s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1;
- hd_geometry_guess(s->bs, &cylinders, &heads, &secs);
+ hd_geometry_guess(s->bs, &cylinders, &heads, &secs, NULL);
s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);
--
1.7.6.5
- [Qemu-devel] [PATCH 05/32] qtest: Tidy up temporary files properly, (continued)
- [Qemu-devel] [PATCH 05/32] qtest: Tidy up temporary files properly, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 03/32] vvfat: Fix partition table, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 21/32] ide: qdev properties for disk geometry, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 01/32] fdc: Drop broken code for user-defined floppy geometry, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 09/32] hd-geometry: Add tracepoints, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 16/32] blockdev: Save geometry in DriveInfo, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 11/32] hd-geometry: Factor out guess_chs_for_size(), Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 02/32] fdc: Move floppy geometry guessing back from block.c, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 14/32] hd-geometry: Cut out block layer translation middleman,
Markus Armbruster <=
- [Qemu-devel] [PATCH 07/32] block: Factor bdrv_read_unthrottled() out of guess_disk_lchs(), Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 28/32] ide pc: Put hard disk info into CMOS only for hard disks, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 15/32] ide pc: Cut out the block layer geometry middleman, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 06/32] qtest: Add hard disk geometry test, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 13/32] hd-geometry: Clean up confusing use of prior translation hint, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 10/32] hd-geometry: Unnest conditional in hd_geometry_guess(), Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 19/32] scsi-hd: qdev properties for disk geometry, Markus Armbruster, 2012/06/29
- [Qemu-devel] [PATCH 30/32] hd-geometry: Compute BIOS CHS translation in one place, Markus Armbruster, 2012/06/29