diff options
author | Christoph Hellwig <hch@lst.de> | 2011-01-24 13:32:41 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-01-31 10:03:00 +0100 |
commit | db97ee6a976bacbb0d18818e951cfc41b39269a7 (patch) | |
tree | 14c8b30a7b745f84da878aab6f35220dd701b79f /hw | |
parent | 6d4a2b3a47959f02e7f307f50396e70e8464f95e (diff) |
block: tell drivers about an image resize
Extend the change_cb callback with a reason argument, and use it
to tell drivers about size changes.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/ide/core.c | 6 | ||||
-rw-r--r-- | hw/sd.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index e698c13ac5..dd63664c0d 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1584,11 +1584,15 @@ 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) +static void cdrom_change_cb(void *opaque, int reason) { IDEState *s = opaque; uint64_t nb_sectors; + if (!(reason & CHANGE_MEDIA)) { + return; + } + bdrv_get_geometry(s->bs, &nb_sectors); s->nb_sectors = nb_sectors; @@ -422,9 +422,14 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv) sd->pwd_len = 0; } -static void sd_cardchange(void *opaque) +static void sd_cardchange(void *opaque, int reason) { SDState *sd = opaque; + + if (!(reason & CHANGE_MEDIA)) { + return; + } + qemu_set_irq(sd->inserted_cb, bdrv_is_inserted(sd->bdrv)); if (bdrv_is_inserted(sd->bdrv)) { sd_reset(sd, sd->bdrv); |