From 8e7cf5e1709dbd56b3118564355fde536ef946e6 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 3 Feb 2011 23:49:00 -0200 Subject: [PATCH 03/15] block: tell drivers about an image resize RH-Author: Christoph Hellwig Message-id: <1296776941-22666-3-git-send-email-chellwig@redhat.com> Patchwork-id: 17654 O-Subject: [RHEL6 qemu PATCH 3/4 v2] block: tell drivers about an image resize Bugzilla: 515775 RH-Acked-by: Juan Quintela RH-Acked-by: Kevin Wolf RH-Acked-by: Jes Sorensen From: Christoph Hellwig Extend the change_cb callback with a reason argument, and use it to tell drivers about size changes. Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf Upstream commit: db97ee6a976bacbb0d18818e951cfc41b39269a7 BZ: 515775 Signed-off-by: Luiz Capitulino --- block.c | 12 ++++++++---- block.h | 3 ++- block_int.h | 5 ++++- hw/ide/core.c | 6 +++++- hw/sd.c | 7 ++++++- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index 6b66fb4..ce3bca6 100644 --- a/block.c +++ b/block.c @@ -609,7 +609,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, /* call the change callback */ bs->media_changed = 1; if (bs->change_cb) - bs->change_cb(bs->change_opaque); + bs->change_cb(bs->change_opaque, CHANGE_MEDIA); } return 0; @@ -643,7 +643,7 @@ void bdrv_close(BlockDriverState *bs) /* call the change callback */ bs->media_changed = 1; if (bs->change_cb) - bs->change_cb(bs->change_opaque); + bs->change_cb(bs->change_opaque, CHANGE_MEDIA); } } @@ -1055,6 +1055,9 @@ int bdrv_truncate(BlockDriverState *bs, int64_t offset) ret = drv->bdrv_truncate(bs, offset); if (ret == 0) { ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS); + if (bs->change_cb) { + bs->change_cb(bs->change_opaque, CHANGE_SIZE); + } } return ret; } @@ -1271,7 +1274,8 @@ int bdrv_enable_write_cache(BlockDriverState *bs) /* XXX: no longer used */ void bdrv_set_change_cb(BlockDriverState *bs, - void (*change_cb)(void *opaque), void *opaque) + void (*change_cb)(void *opaque, int reason), + void *opaque) { bs->change_cb = change_cb; bs->change_opaque = opaque; @@ -1316,7 +1320,7 @@ int bdrv_set_key(BlockDriverState *bs, const char *key) /* call the change callback now, we skipped it on open */ bs->media_changed = 1; if (bs->change_cb) - bs->change_cb(bs->change_opaque); + bs->change_cb(bs->change_opaque, CHANGE_MEDIA); } return ret; } diff --git a/block.h b/block.h index af88469..15e68ee 100644 --- a/block.h +++ b/block.h @@ -172,7 +172,8 @@ int bdrv_is_locked(BlockDriverState *bs); void bdrv_set_locked(BlockDriverState *bs, int locked); int bdrv_eject(BlockDriverState *bs, int eject_flag); void bdrv_set_change_cb(BlockDriverState *bs, - void (*change_cb)(void *opaque), void *opaque); + void (*change_cb)(void *opaque, int reason), + void *opaque); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), diff --git a/block_int.h b/block_int.h index 467b759..76f0613 100644 --- a/block_int.h +++ b/block_int.h @@ -148,7 +148,7 @@ struct BlockDriverState { int valid_key; /* if true, a valid encryption key has been set */ int sg; /* if true, the device is a /dev/sg* */ /* event callback when inserting/removing */ - void (*change_cb)(void *opaque); + void (*change_cb)(void *opaque, int reason); void *change_opaque; BlockDriver *drv; /* NULL means no media */ @@ -194,6 +194,9 @@ struct BlockDriverState { void *private; }; +#define CHANGE_MEDIA 0x01 +#define CHANGE_SIZE 0x02 + struct BlockDriverAIOCB { AIOPool *pool; BlockDriverState *bs; diff --git a/hw/ide/core.c b/hw/ide/core.c index 2f6dd1a..eb6d001 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1728,11 +1728,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; diff --git a/hw/sd.c b/hw/sd.c index 9f4fbe8..b827a4c 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -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); -- 1.7.4.rc1.16.gd2f15e