All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
	Markus Armbruster <armbru@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	John Snow <jsnow@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool
Date: Mon, 12 Oct 2015 22:00:08 +0200	[thread overview]
Message-ID: <1444680042-13207-6-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1444680042-13207-1-git-send-email-mreitz@redhat.com>

Make bdrv_is_inserted(), blk_is_inserted(), and the callback
BlockDriver.bdrv_is_inserted() return a bool.

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c                        | 12 +++++++-----
 block/block-backend.c          |  2 +-
 block/raw-posix.c              |  8 +++-----
 block/raw_bsd.c                |  2 +-
 include/block/block.h          |  2 +-
 include/block/block_int.h      |  2 +-
 include/sysemu/block-backend.h |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/block.c b/block.c
index 0ae3fcf..15a11bf 100644
--- a/block.c
+++ b/block.c
@@ -3130,14 +3130,16 @@ void bdrv_invalidate_cache_all(Error **errp)
 /**
  * Return TRUE if the media is present
  */
-int bdrv_is_inserted(BlockDriverState *bs)
+bool bdrv_is_inserted(BlockDriverState *bs)
 {
     BlockDriver *drv = bs->drv;
 
-    if (!drv)
-        return 0;
-    if (!drv->bdrv_is_inserted)
-        return 1;
+    if (!drv) {
+        return false;
+    }
+    if (!drv->bdrv_is_inserted) {
+        return true;
+    }
     return drv->bdrv_is_inserted(bs);
 }
 
diff --git a/block/block-backend.c b/block/block-backend.c
index 2256551..1db002c 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -769,7 +769,7 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp)
     bdrv_invalidate_cache(blk->bs, errp);
 }
 
-int blk_is_inserted(BlockBackend *blk)
+bool blk_is_inserted(BlockBackend *blk)
 {
     return bdrv_is_inserted(blk->bs);
 }
diff --git a/block/raw-posix.c b/block/raw-posix.c
index afd1c59..c014724 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -2389,15 +2389,13 @@ out:
     return prio;
 }
 
-static int cdrom_is_inserted(BlockDriverState *bs)
+static bool cdrom_is_inserted(BlockDriverState *bs)
 {
     BDRVRawState *s = bs->opaque;
     int ret;
 
     ret = ioctl(s->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
-    if (ret == CDS_DISC_OK)
-        return 1;
-    return 0;
+    return ret == CDS_DISC_OK;
 }
 
 static void cdrom_eject(BlockDriverState *bs, bool eject_flag)
@@ -2523,7 +2521,7 @@ static int cdrom_reopen(BlockDriverState *bs)
     return 0;
 }
 
-static int cdrom_is_inserted(BlockDriverState *bs)
+static bool cdrom_is_inserted(BlockDriverState *bs)
 {
     return raw_getlength(bs) > 0;
 }
diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index 63ee911..3c7b413 100644
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -154,7 +154,7 @@ static int raw_truncate(BlockDriverState *bs, int64_t offset)
     return bdrv_truncate(bs->file->bs, offset);
 }
 
-static int raw_is_inserted(BlockDriverState *bs)
+static bool raw_is_inserted(BlockDriverState *bs)
 {
     return bdrv_is_inserted(bs->file->bs);
 }
diff --git a/include/block/block.h b/include/block/block.h
index 1520dee..cb3e312 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -399,7 +399,7 @@ int bdrv_is_read_only(BlockDriverState *bs);
 int bdrv_is_sg(BlockDriverState *bs);
 int bdrv_enable_write_cache(BlockDriverState *bs);
 void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce);
-int bdrv_is_inserted(BlockDriverState *bs);
+bool bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);
 void bdrv_lock_medium(BlockDriverState *bs, bool locked);
 void bdrv_eject(BlockDriverState *bs, bool eject_flag);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index c0e6513..40d40df 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -212,7 +212,7 @@ struct BlockDriver {
         const char *backing_file, const char *backing_fmt);
 
     /* removable device specific */
-    int (*bdrv_is_inserted)(BlockDriverState *bs);
+    bool (*bdrv_is_inserted)(BlockDriverState *bs);
     int (*bdrv_media_changed)(BlockDriverState *bs);
     void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag);
     void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 8fc960f..8f2bf10 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -130,7 +130,7 @@ int blk_is_sg(BlockBackend *blk);
 int blk_enable_write_cache(BlockBackend *blk);
 void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
 void blk_invalidate_cache(BlockBackend *blk, Error **errp);
-int blk_is_inserted(BlockBackend *blk);
+bool blk_is_inserted(BlockBackend *blk);
 void blk_lock_medium(BlockBackend *blk, bool locked);
 void blk_eject(BlockBackend *blk, bool eject_flag);
 int blk_get_flags(BlockBackend *blk);
-- 
2.6.1

  parent reply	other threads:[~2015-10-12 20:01 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12 20:00 [Qemu-devel] [PATCH v6 00/39] blockdev: BlockBackend and media Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 01/39] block: Remove host floppy support Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options() Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 03/39] blockdev: Allow creation of BDS trees without BB Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 04/39] iotests: Only create BB if necessary Max Reitz
2015-10-12 20:00 ` Max Reitz [this message]
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available() Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 07/39] block: Make bdrv_is_inserted() recursive Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 08/39] block/raw_bsd: Drop raw_is_inserted() Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 10/39] hw/block/fdc: Implement tray status Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 11/39] hw/usb-storage: Check whether BB is inserted Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 12/39] block: Fix BB AIOCB AioContext without BDS Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 13/39] block: Move guest_block_size into BlockBackend Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 15/39] block: Move BlockAcctStats into BlockBackend Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 16/39] block: Move I/O status and error actions into BB Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 17/39] block/throttle-groups: Make incref/decref public Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 18/39] block: Add BlockBackendRootState Max Reitz
2015-10-19 14:18   ` Kevin Wolf
2015-10-19 14:32     ` Max Reitz
2015-10-19 14:42       ` Kevin Wolf
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 19/39] block: Make some BB functions fall back to BBRS Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 20/39] block: Fail requests to empty BlockBackend Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 21/39] block: Prepare remaining BB functions for NULL BDS Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 22/39] block: Add blk_insert_bs() Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 23/39] block: Prepare for NULL BDS Max Reitz
2015-10-13 15:37   ` Kevin Wolf
2015-10-14 15:06     ` Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 24/39] blockdev: Do not create BDS for empty drive Max Reitz
2015-10-14 13:27   ` Kevin Wolf
2015-10-14 15:13     ` Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 25/39] blockdev: Pull out blockdev option extraction Max Reitz
2015-10-14 15:12   ` Kevin Wolf
2015-10-14 15:16     ` Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 26/39] blockdev: Allow more options for BB-less BDS tree Max Reitz
2015-10-15 11:29   ` Kevin Wolf
2015-10-17 16:33     ` Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 27/39] block: Add blk_remove_bs() Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 28/39] blockdev: Add blockdev-open-tray Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 29/39] blockdev: Add blockdev-close-tray Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 30/39] blockdev: Add blockdev-remove-medium Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 31/39] blockdev: Add blockdev-insert-medium Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 32/39] blockdev: Implement eject with basic operations Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 33/39] blockdev: Implement change " Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-moved events Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 35/39] qmp: Introduce blockdev-change-medium Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 36/39] hmp: Use blockdev-change-medium for change command Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 37/39] blockdev: read-only-mode for blockdev-change-medium Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 38/39] hmp: Add read-only-mode option to change command Max Reitz
2015-10-12 20:00 ` [Qemu-devel] [PATCH v6 39/39] iotests: Add test for change-related QMP commands Max Reitz
2015-10-13 15:38 ` [Qemu-devel] [PATCH v6 00/39] blockdev: BlockBackend and media Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444680042-13207-6-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berto@igalia.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.