From patchwork Tue Sep 6 15:39:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 113641 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 23A42B6F70 for ; Wed, 7 Sep 2011 03:37:50 +1000 (EST) Received: from localhost ([::1]:41198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xik-0003Fg-Af for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 11:37:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xi4-0001dB-GL for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xhy-0003lA-3D for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xhx-0003l1-Rk for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:06 -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 p86Fb4fq001838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Sep 2011 11:37:04 -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 p86FamTO015671; Tue, 6 Sep 2011 11:37:03 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 6 Sep 2011 17:39:27 +0200 Message-Id: <1315323586-23840-13-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 12/31] block: Leave tracking media change to device models 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 hw/fdc.c is the only one that cares. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 20 ++++++-------------- block_int.h | 1 - hw/fdc.c | 40 ++++++++++++++++++---------------------- 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/block.c b/block.c index 0aba1bf..2158f83 100644 --- a/block.c +++ b/block.c @@ -689,7 +689,6 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, } if (!bdrv_key_required(bs)) { - bs->media_changed = 1; bdrv_dev_change_media_cb(bs); } @@ -726,7 +725,6 @@ void bdrv_close(BlockDriverState *bs) bdrv_close(bs->file); } - bs->media_changed = 1; bdrv_dev_change_media_cb(bs); } } @@ -1665,7 +1663,6 @@ 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 */ - bs->media_changed = 1; bdrv_dev_change_media_cb(bs); } return ret; @@ -3040,22 +3037,17 @@ int bdrv_is_inserted(BlockDriverState *bs) } /** - * Return TRUE if the media changed since the last call to this - * function. It is currently only used for floppy disks + * Return whether the media changed since the last call to this + * function, or -ENOTSUP if we don't know. Most drivers don't know. */ int bdrv_media_changed(BlockDriverState *bs) { BlockDriver *drv = bs->drv; - int ret; - if (!drv || !drv->bdrv_media_changed) - ret = -ENOTSUP; - else - ret = drv->bdrv_media_changed(bs); - if (ret == -ENOTSUP) - ret = bs->media_changed; - bs->media_changed = 0; - return ret; + if (drv && drv->bdrv_media_changed) { + return drv->bdrv_media_changed(bs); + } + return -ENOTSUP; } /** diff --git a/block_int.h b/block_int.h index 19ae75e..539b4ed 100644 --- a/block_int.h +++ b/block_int.h @@ -175,7 +175,6 @@ struct BlockDriverState { this file image */ char backing_format[16]; /* if non-zero and backing_file exists */ int is_temporary; - int media_changed; BlockDriverState *backing_hd; BlockDriverState *file; diff --git a/hw/fdc.c b/hw/fdc.c index 580b657..4f4c621 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -535,30 +535,11 @@ static CPUWriteMemoryFunc * const fdctrl_mem_write_strict[3] = { NULL, }; -static void fdrive_media_changed_pre_save(void *opaque) -{ - FDrive *drive = opaque; - - drive->media_changed = drive->bs->media_changed; -} - -static int fdrive_media_changed_post_load(void *opaque, int version_id) -{ - FDrive *drive = opaque; - - if (drive->bs != NULL) { - drive->bs->media_changed = drive->media_changed; - } - - /* User ejected the floppy when drive->bs == NULL */ - return 0; -} - static bool fdrive_media_changed_needed(void *opaque) { FDrive *drive = opaque; - return (drive->bs != NULL && drive->bs->media_changed != 1); + return (drive->bs != NULL && drive->media_changed != 1); } static const VMStateDescription vmstate_fdrive_media_changed = { @@ -566,8 +547,6 @@ static const VMStateDescription vmstate_fdrive_media_changed = { .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, - .pre_save = fdrive_media_changed_pre_save, - .post_load = fdrive_media_changed_post_load, .fields = (VMStateField[]) { VMSTATE_UINT8(media_changed, FDrive), VMSTATE_END_OF_LIST() @@ -920,6 +899,10 @@ static int fdctrl_media_changed(FDrive *drv) if (!drv->bs) return 0; ret = bdrv_media_changed(drv->bs); + if (ret < 0) { + ret = drv->media_changed; + } + drv->media_changed = 0; if (ret) { fd_revalidate(drv); } @@ -1791,6 +1774,17 @@ static void fdctrl_result_timer(void *opaque) fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); } +static void fdctrl_change_cb(void *opaque) +{ + FDrive *drive = opaque; + + drive->media_changed = 1; +} + +static const BlockDevOps fdctrl_block_ops = { + .change_media_cb = fdctrl_change_cb, +}; + /* Init functions */ static int fdctrl_connect_drives(FDCtrl *fdctrl) { @@ -1814,7 +1808,9 @@ static int fdctrl_connect_drives(FDCtrl *fdctrl) fd_init(drive); fd_revalidate(drive); if (drive->bs) { + drive->media_changed = 1; bdrv_set_removable(drive->bs, 1); + bdrv_set_dev_ops(drive->bs, &fdctrl_block_ops, drive); } } return 0;