From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47970 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhLb9-0002yB-IJ for qemu-devel@nongnu.org; Mon, 24 Jan 2011 07:32:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhLb8-0007oH-C2 for qemu-devel@nongnu.org; Mon, 24 Jan 2011 07:32:43 -0500 Received: from verein.lst.de ([213.95.11.210]:54226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhLb8-0007oB-2O for qemu-devel@nongnu.org; Mon, 24 Jan 2011 07:32:42 -0500 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id p0OCWfE5016638 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Mon, 24 Jan 2011 13:32:41 +0100 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id p0OCWfBX016637 for qemu-devel@nongnu.org; Mon, 24 Jan 2011 13:32:41 +0100 Date: Mon, 24 Jan 2011 13:32:41 +0100 From: Christoph Hellwig Message-ID: <20110124123241.GB16613@lst.de> References: <20110124123223.GA16558@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110124123223.GA16558@lst.de> Subject: [Qemu-devel] [PATCH 2/3] block: tell drivers about an image resize List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Extend the change_cb callback with a reason argument, and use it to tell drivers about size changes. Signed-off-by: Christoph Hellwig Index: qemu/block.c =================================================================== --- qemu.orig/block.c 2011-01-24 11:56:20.899004129 +0100 +++ qemu/block.c 2011-01-24 11:56:39.796004269 +0100 @@ -645,7 +645,7 @@ int bdrv_open(BlockDriverState *bs, cons /* 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; @@ -684,7 +684,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); } } @@ -1135,6 +1135,9 @@ int bdrv_truncate(BlockDriverState *bs, 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; } @@ -1366,7 +1369,8 @@ int bdrv_enable_write_cache(BlockDriverS /* 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; @@ -1411,7 +1415,7 @@ int bdrv_set_key(BlockDriverState *bs, c /* 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; } Index: qemu/block.h =================================================================== --- qemu.orig/block.h 2011-01-24 11:52:25.248004200 +0100 +++ qemu/block.h 2011-01-24 11:56:39.797004269 +0100 @@ -182,7 +182,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); BlockDriverState *bdrv_next(BlockDriverState *bs); Index: qemu/block_int.h =================================================================== --- qemu.orig/block_int.h 2011-01-24 11:52:25.255004060 +0100 +++ qemu/block_int.h 2011-01-24 11:56:39.801004059 +0100 @@ -153,7 +153,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 */ @@ -203,6 +203,9 @@ struct BlockDriverState { void *private; }; +#define CHANGE_MEDIA 0x01 +#define CHANGE_SIZE 0x02 + struct BlockDriverAIOCB { AIOPool *pool; BlockDriverState *bs; Index: qemu/hw/ide/core.c =================================================================== --- qemu.orig/hw/ide/core.c 2011-01-24 11:56:20.904004339 +0100 +++ qemu/hw/ide/core.c 2011-01-24 11:56:39.807004199 +0100 @@ -1584,11 +1584,15 @@ static void ide_cfata_metadata_write(IDE } /* 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; Index: qemu/hw/sd.c =================================================================== --- qemu.orig/hw/sd.c 2011-01-24 11:52:25.281004130 +0100 +++ qemu/hw/sd.c 2011-01-24 11:56:39.813007971 +0100 @@ -422,9 +422,14 @@ static void sd_reset(SDState *sd, BlockD 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);