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 27/39] block: Add blk_remove_bs()
Date: Mon, 12 Oct 2015 22:00:30 +0200	[thread overview]
Message-ID: <1444680042-13207-28-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1444680042-13207-1-git-send-email-mreitz@redhat.com>

This function removes the BlockDriverState associated with the given
BlockBackend from that BB and sets the BDS pointer in the BB to NULL.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/block-backend.c          | 12 ++++++++++++
 include/sysemu/block-backend.h |  1 +
 2 files changed, 13 insertions(+)

diff --git a/block/block-backend.c b/block/block-backend.c
index 19fdaae..eb7409c 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -334,6 +334,18 @@ void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk)
 }
 
 /*
+ * Disassociates the currently associated BlockDriverState from @blk.
+ */
+void blk_remove_bs(BlockBackend *blk)
+{
+    blk_update_root_state(blk);
+
+    bdrv_unref(blk->bs);
+    blk->bs->blk = NULL;
+    blk->bs = NULL;
+}
+
+/*
  * Associates a new BlockDriverState with @blk.
  */
 void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 9306a52..14a6d32 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -72,6 +72,7 @@ BlockBackend *blk_by_name(const char *name);
 BlockBackend *blk_next(BlockBackend *blk);
 
 BlockDriverState *blk_bs(BlockBackend *blk);
+void blk_remove_bs(BlockBackend *blk);
 void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs);
 
 void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk);
-- 
2.6.1

  parent reply	other threads:[~2015-10-12 20:02 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 ` [Qemu-devel] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool Max Reitz
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 ` Max Reitz [this message]
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-28-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.