From patchwork Tue Sep 6 15:39:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 113613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36258B6F6F for ; Wed, 7 Sep 2011 02:59:35 +1000 (EST) Received: from localhost ([::1]:40992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xib-0003Bj-7V for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 11:37:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xhy-0001LN-BI for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xhs-0003jO-86 for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xhr-0003j4-RW for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:00 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p86FawMn017252 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Sep 2011 11:36:58 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p86FamTJ015671; Tue, 6 Sep 2011 11:36:57 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 6 Sep 2011 17:39:22 +0200 Message-Id: <1315323586-23840-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1315323586-23840-1-git-send-email-kwolf@redhat.com> References: <1315323586-23840-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/31] block: Split change_cb() into change_media_cb(), resize_cb() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Multiplexing callbacks complicates matters needlessly. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- 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 00fe345..0aba1bf 100644 --- a/block.c +++ b/block.c @@ -44,7 +44,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); @@ -690,7 +690,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; @@ -727,7 +727,7 @@ void bdrv_close(BlockDriverState *bs) } bs->media_changed = 1; - bdrv_dev_change_cb(bs, CHANGE_MEDIA); + bdrv_dev_change_media_cb(bs); } } @@ -806,10 +806,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); } } @@ -1283,7 +1290,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; } @@ -1659,7 +1666,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 a72cfc9..7e3f587 100644 --- a/block.h +++ b/block.h @@ -28,8 +28,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 ab31dc9..19ae75e 100644 --- a/block_int.h +++ b/block_int.h @@ -211,9 +211,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 26a9c5b..47a706e 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, diff --git a/hw/sd.c b/hw/sd.c index 1f00910..45e95f9 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -420,14 +420,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); @@ -436,7 +432,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 c10afa9..4df23f4 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -543,17 +543,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,