diff options
| author | Markus Armbruster | 2011-08-03 15:07:42 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2011-09-06 11:23:51 +0200 |
| commit | 145feb176ffe6de1db6d05af064c841d7c16633c (patch) | |
| tree | f69598e83c5a2b36fcecd043e7a234dcbeb77a2e /hw/ide/core.c | |
| parent | block: Generalize change_cb() to BlockDevOps (diff) | |
| download | qemu-145feb176ffe6de1db6d05af064c841d7c16633c.tar.gz qemu-145feb176ffe6de1db6d05af064c841d7c16633c.tar.xz qemu-145feb176ffe6de1db6d05af064c841d7c16633c.zip | |
block: Split change_cb() into change_media_cb(), resize_cb()
Multiplexing callbacks complicates matters needlessly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/core.c')
| -rw-r--r-- | hw/ide/core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 26a9c5ba14..47a706e4c4 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -783,15 +783,11 @@ static void ide_cfata_metadata_write(IDEState *s) } /* called when the inserted state of the media has changed */ -static void cdrom_change_cb(void *opaque, int reason) +static void ide_cd_change_cb(void *opaque) { IDEState *s = opaque; uint64_t nb_sectors; - if (!(reason & CHANGE_MEDIA)) { - return; - } - bdrv_get_geometry(s->bs, &nb_sectors); s->nb_sectors = nb_sectors; @@ -1743,7 +1739,7 @@ void ide_bus_reset(IDEBus *bus) } static const BlockDevOps ide_cd_block_ops = { - .change_cb = cdrom_change_cb, + .change_media_cb = ide_cd_change_cb, }; int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, |