From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZk-0003jt-Eo for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZe-0008PW-Vp for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:43 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZc-0008Nc-21 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:36 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:39 +0200 Message-Id: <1311179069-27882-6-git-send-email-armbru@redhat.com> In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 05/55] block: Split change_cb() into change_media_cb(), resize_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com Multiplexing callbacks complicates matters needlessly. Signed-off-by: Markus Armbruster --- block.c | 23 +++++++++++++++-------- block.h | 12 +++++++++++- block_int.h | 3 --- hw/ide/core.c | 8 ++------ hw/sd.c | 8 ++------ hw/virtio-blk.c | 8 +++----- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/block.c b/block.c index 2a1f7af..fab766a 100644 --- a/block.c +++ b/block.c @@ -43,7 +43,7 @@ #include #endif -static void bdrv_dev_change_cb(BlockDriverState *bs, int reason); +static void bdrv_dev_change_media_cb(BlockDriverState *bs); static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); @@ -638,7 +638,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, if (!bdrv_key_required(bs)) { bs->media_changed = 1; - bdrv_dev_change_cb(bs, CHANGE_MEDIA); + bdrv_dev_change_media_cb(bs); } return 0; @@ -675,7 +675,7 @@ void bdrv_close(BlockDriverState *bs) } bs->media_changed = 1; - bdrv_dev_change_cb(bs, CHANGE_MEDIA); + bdrv_dev_change_media_cb(bs); } } @@ -754,10 +754,17 @@ void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops, bs->dev_opaque = opaque; } -static void bdrv_dev_change_cb(BlockDriverState *bs, int reason) +static void bdrv_dev_change_media_cb(BlockDriverState *bs) { - if (bs->dev_ops && bs->dev_ops->change_cb) { - bs->dev_ops->change_cb(bs->dev_opaque, reason); + if (bs->dev_ops && bs->dev_ops->change_media_cb) { + bs->dev_ops->change_media_cb(bs->dev_opaque); + } +} + +static void bdrv_dev_resize_cb(BlockDriverState *bs) +{ + if (bs->dev_ops && bs->dev_ops->resize_cb) { + bs->dev_ops->resize_cb(bs->dev_opaque); } } @@ -1163,7 +1170,7 @@ 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); - bdrv_dev_change_cb(bs, CHANGE_SIZE); + bdrv_dev_resize_cb(bs); } return ret; } @@ -1520,7 +1527,7 @@ int bdrv_set_key(BlockDriverState *bs, const char *key) bs->valid_key = 1; /* call the change callback now, we skipped it on open */ bs->media_changed = 1; - bdrv_dev_change_cb(bs, CHANGE_MEDIA); + bdrv_dev_change_media_cb(bs); } return ret; } diff --git a/block.h b/block.h index 623c488..89f75e3 100644 --- a/block.h +++ b/block.h @@ -27,8 +27,18 @@ typedef struct QEMUSnapshotInfo { uint64_t vm_clock_nsec; /* VM clock relative to boot */ } QEMUSnapshotInfo; +/* Callbacks for block device models */ typedef struct BlockDevOps { - void (*change_cb)(void *opaque, int reason); + /* + * Runs when virtual media changed (monitor commands eject, change) + * Beware: doesn't run when a host device's physical media + * changes. Sure would be useful if it did. + */ + void (*change_media_cb)(void *opaque); + /* + * Runs when the size changed (e.g. monitor command block_resize) + */ + void (*resize_cb)(void *opaque); } BlockDevOps; #define BDRV_O_RDWR 0x0002 diff --git a/block_int.h b/block_int.h index e2fa254..f5d67c1 100644 --- a/block_int.h +++ b/block_int.h @@ -203,9 +203,6 @@ 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 773b7cf..ec043a3 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -758,15 +758,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; @@ -1718,7 +1714,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, diff --git a/hw/sd.c b/hw/sd.c index 94cea3d..4dc9047 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -422,14 +422,10 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv) sd->pwd_len = 0; } -static void sd_cardchange(void *opaque, int reason) +static void sd_cardchange(void *opaque) { 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); @@ -438,7 +434,7 @@ static void sd_cardchange(void *opaque, int reason) } static const BlockDevOps sd_block_ops = { - .change_cb = sd_cardchange, + .change_media_cb = sd_cardchange, }; /* We do not model the chip select pin, so allow the board to select diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 9e5ef88..dc0b692 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -527,17 +527,15 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void virtio_blk_change_cb(void *opaque, int reason) +static void virtio_blk_resize(void *opaque) { VirtIOBlock *s = opaque; - if (reason & CHANGE_SIZE) { - virtio_notify_config(&s->vdev); - } + virtio_notify_config(&s->vdev); } static const BlockDevOps virtio_block_ops = { - .change_cb = virtio_blk_change_cb, + .resize_cb = virtio_blk_resize, }; VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, -- 1.7.2.3