diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-07-10 11:12:38 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-17 16:48:30 +0200 |
| commit | 9139046c16688615023f35668660f6d3947a05d6 (patch) | |
| tree | 8575e068894f580ccf7c48ee34fcb46df5d9dc75 /hw/ide/qdev.c | |
| parent | e2f3dc2b6a205cf969ba5d1307293db17fd9621f (diff) | |
| download | qemu-9139046c16688615023f35668660f6d3947a05d6.tar.gz qemu-9139046c16688615023f35668660f6d3947a05d6.tar.bz2 qemu-9139046c16688615023f35668660f6d3947a05d6.zip | |
ide pc: Cut out the block layer geometry middleman
PC BIOS setup needs IDE geometry information. Get it directly from
the device model rather than through the block layer. In preparation
of purging geometry from the block layer, which will happen later in
this series.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/qdev.c')
| -rw-r--r-- | hw/ide/qdev.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index c122395401..87e0b75ae4 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -111,11 +111,24 @@ IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) return DO_UPCAST(IDEDevice, qdev, dev); } -void ide_get_bs(BlockDriverState *bs[], BusState *qbus) +int ide_get_geometry(BusState *bus, int unit, + int16_t *cyls, int8_t *heads, int8_t *secs) { - IDEBus *bus = DO_UPCAST(IDEBus, qbus, qbus); - bs[0] = bus->master ? bus->master->conf.bs : NULL; - bs[1] = bus->slave ? bus->slave->conf.bs : NULL; + IDEState *s = &DO_UPCAST(IDEBus, qbus, bus)->ifs[unit]; + + if (!s->bs) { + return -1; + } + + *cyls = s->cylinders; + *heads = s->heads; + *secs = s->sectors; + return 0; +} + +int ide_get_bios_chs_trans(BusState *bus, int unit) +{ + return DO_UPCAST(IDEBus, qbus, bus)->ifs[unit].chs_trans; } /* --------------------------------- */ |