From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RxjoS-0005Zr-CS for qemu-devel@nongnu.org; Wed, 15 Feb 2012 13:42:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RxjoO-0004BE-FX for qemu-devel@nongnu.org; Wed, 15 Feb 2012 13:42:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RxjoO-0004B2-1Z for qemu-devel@nongnu.org; Wed, 15 Feb 2012 13:42:40 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1FIgd3F020866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 15 Feb 2012 13:42:39 -0500 From: Luiz Capitulino Date: Wed, 15 Feb 2012 16:42:25 -0200 Message-Id: <1329331347-11232-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1329331347-11232-1-git-send-email-lcapitulino@redhat.com> References: <1329331347-11232-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] block: bdrv_eject(): Make eject_flag a real bool List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, eblake@redhat.com, armbru@redhat.com Signed-off-by: Luiz Capitulino --- block.c | 2 +- block.h | 2 +- block/raw-posix.c | 6 +++--- block/raw.c | 2 +- block_int.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index d867d0f..b5710e1 100644 --- a/block.c +++ b/block.c @@ -3560,7 +3560,7 @@ int bdrv_media_changed(BlockDriverState *bs) /** * If eject_flag is TRUE, eject the media. Otherwise, close the tray */ -void bdrv_eject(BlockDriverState *bs, int eject_flag) +void bdrv_eject(BlockDriverState *bs, bool eject_flag) { BlockDriver *drv = bs->drv; diff --git a/block.h b/block.h index 36a53a0..ce8c5ed 100644 --- a/block.h +++ b/block.h @@ -257,7 +257,7 @@ int bdrv_enable_write_cache(BlockDriverState *bs); int bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); void bdrv_lock_medium(BlockDriverState *bs, bool locked); -void bdrv_eject(BlockDriverState *bs, int eject_flag); +void bdrv_eject(BlockDriverState *bs, bool eject_flag); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_next(BlockDriverState *bs); diff --git a/block/raw-posix.c b/block/raw-posix.c index 2ee5d69..2d1bc13 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -994,7 +994,7 @@ static int floppy_media_changed(BlockDriverState *bs) return ret; } -static void floppy_eject(BlockDriverState *bs, int eject_flag) +static void floppy_eject(BlockDriverState *bs, bool eject_flag) { BDRVRawState *s = bs->opaque; int fd; @@ -1084,7 +1084,7 @@ static int cdrom_is_inserted(BlockDriverState *bs) return 0; } -static void cdrom_eject(BlockDriverState *bs, int eject_flag) +static void cdrom_eject(BlockDriverState *bs, bool eject_flag) { BDRVRawState *s = bs->opaque; @@ -1194,7 +1194,7 @@ static int cdrom_is_inserted(BlockDriverState *bs) return raw_getlength(bs) > 0; } -static void cdrom_eject(BlockDriverState *bs, int eject_flag) +static void cdrom_eject(BlockDriverState *bs, bool eject_flag) { BDRVRawState *s = bs->opaque; diff --git a/block/raw.c b/block/raw.c index 6098070..1cdac0c 100644 --- a/block/raw.c +++ b/block/raw.c @@ -61,7 +61,7 @@ static int raw_media_changed(BlockDriverState *bs) return bdrv_media_changed(bs->file); } -static void raw_eject(BlockDriverState *bs, int eject_flag) +static void raw_eject(BlockDriverState *bs, bool eject_flag) { bdrv_eject(bs->file, eject_flag); } diff --git a/block_int.h b/block_int.h index 7be2988..f954add 100644 --- a/block_int.h +++ b/block_int.h @@ -189,7 +189,7 @@ struct BlockDriver { /* removable device specific */ int (*bdrv_is_inserted)(BlockDriverState *bs); int (*bdrv_media_changed)(BlockDriverState *bs); - void (*bdrv_eject)(BlockDriverState *bs, int eject_flag); + void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag); void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked); /* to control generic scsi devices */ -- 1.7.9.111.gf3fb0.dirty