From patchwork Wed Aug 3 13:08:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 108259 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 0B5C1B71DE for ; Thu, 4 Aug 2011 01:05:16 +1000 (EST) Received: from localhost ([::1]:47280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobIn-0008DK-EH for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 09:16:01 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHi-0005NU-IB for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobHg-0002XQ-C9 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:54 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:36922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHf-0002WJ-ME for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:51 -0400 Received: from blackfin.pond.sub.org (p5B32D904.dip.t-dialin.net [91.50.217.4]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 9F660A2C90; Wed, 3 Aug 2011 15:14:50 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 1813960078; Wed, 3 Aug 2011 15:08:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 15:08:23 +0200 Message-Id: <1312376904-16115-45-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH v2 44/45] block: New change_media_cb() parameter load 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 To let device models distinguish between eject and load. Signed-off-by: Markus Armbruster --- block.c | 12 ++++++------ block.h | 3 ++- hw/fdc.c | 2 +- hw/ide/core.c | 2 +- hw/scsi-disk.c | 2 +- hw/sd.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/block.c b/block.c index b0e54ef..1bd67dd 100644 --- a/block.c +++ b/block.c @@ -44,7 +44,7 @@ #include #endif -static void bdrv_dev_change_media_cb(BlockDriverState *bs); +static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load); static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); @@ -661,7 +661,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, } if (!bdrv_key_required(bs)) { - bdrv_dev_change_media_cb(bs); + bdrv_dev_change_media_cb(bs, true); } return 0; @@ -697,7 +697,7 @@ void bdrv_close(BlockDriverState *bs) bdrv_close(bs->file); } - bdrv_dev_change_media_cb(bs); + bdrv_dev_change_media_cb(bs, false); } } @@ -780,10 +780,10 @@ void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops, } } -static void bdrv_dev_change_media_cb(BlockDriverState *bs) +static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load) { if (bs->dev_ops && bs->dev_ops->change_media_cb) { - bs->dev_ops->change_media_cb(bs->dev_opaque); + bs->dev_ops->change_media_cb(bs->dev_opaque, load); } } @@ -1634,7 +1634,7 @@ int bdrv_set_key(BlockDriverState *bs, const char *key) } else if (!bs->valid_key) { bs->valid_key = 1; /* call the change callback now, we skipped it on open */ - bdrv_dev_change_media_cb(bs); + bdrv_dev_change_media_cb(bs, 1); } return ret; } diff --git a/block.h b/block.h index 3885208..3fe0357 100644 --- a/block.h +++ b/block.h @@ -32,11 +32,12 @@ typedef struct QEMUSnapshotInfo { typedef struct BlockDevOps { /* * Runs when virtual media changed (monitor commands eject, change) + * Argument load is true on load and false on eject. * Beware: doesn't run when a host device's physical media * changes. Sure would be useful if it did. * Device models with removable media must implement this callback. */ - void (*change_media_cb)(void *opaque); + void (*change_media_cb)(void *opaque, bool load); /* * Is medium ejected from the device? * Device models calling bdrv_eject() should implement this. diff --git a/hw/fdc.c b/hw/fdc.c index e8da6a9..1f084ce 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1777,7 +1777,7 @@ static void fdctrl_result_timer(void *opaque) fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); } -static void fdctrl_change_cb(void *opaque) +static void fdctrl_change_cb(void *opaque, bool load) { FDrive *drive = opaque; diff --git a/hw/ide/core.c b/hw/ide/core.c index bd59016..832fdda 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -759,7 +759,7 @@ static void ide_cfata_metadata_write(IDEState *s) } /* called when the inserted state of the media has changed */ -static void ide_cd_change_cb(void *opaque) +static void ide_cd_change_cb(void *opaque, bool load) { IDEState *s = opaque; uint64_t nb_sectors; diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 71d6408..aa90ede 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1212,7 +1212,7 @@ static void scsi_destroy(SCSIDevice *dev) blockdev_mark_auto_del(s->qdev.conf.bs); } -static void scsi_cd_change_media_cb(void *opaque) +static void scsi_cd_change_media_cb(void *opaque, bool load) { } diff --git a/hw/sd.c b/hw/sd.c index 3bcfe6a..e756996 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -419,7 +419,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv) sd->pwd_len = 0; } -static void sd_cardchange(void *opaque) +static void sd_cardchange(void *opaque, bool load) { SDState *sd = opaque;