From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, berto@igalia.com, qemu-devel@nongnu.org,
jcody@redhat.com, armbru@redhat.com, mreitz@redhat.com,
stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 11/16] block-backend: Add blk_set_bs()
Date: Thu, 17 Sep 2015 15:48:15 +0200 [thread overview]
Message-ID: <1442497700-2536-12-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1442497700-2536-1-git-send-email-kwolf@redhat.com>
It allows changing the BlockDriverState that a BlockBackend points to.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/block-backend.c | 16 ++++++++++++++++
include/block/block_int.h | 2 ++
2 files changed, 18 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index c2e8732..a2afcff 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -239,6 +239,22 @@ BlockDriverState *blk_bs(BlockBackend *blk)
}
/*
+ * Changes the BlockDriverState attached to @blk
+ */
+void blk_set_bs(BlockBackend *blk, BlockDriverState *bs)
+{
+ bdrv_ref(bs);
+
+ if (blk->bs) {
+ blk->bs->blk = NULL;
+ bdrv_unref(blk->bs);
+ }
+
+ blk->bs = bs;
+ bs->blk = blk;
+}
+
+/*
* Return @blk's DriveInfo if any, else null.
*/
DriveInfo *blk_legacy_dinfo(BlockBackend *blk)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 4598101..cfcae52 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -659,6 +659,8 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target,
BlockCompletionFunc *cb, void *opaque,
Error **errp);
+void blk_set_bs(BlockBackend *blk, BlockDriverState *bs);
+
void blk_dev_change_media_cb(BlockBackend *blk, bool load);
bool blk_dev_has_removable_media(BlockBackend *blk);
void blk_dev_eject_request(BlockBackend *blk, bool force);
--
1.8.3.1
next prev parent reply other threads:[~2015-09-17 13:49 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 13:48 [Qemu-devel] [PATCH 00/16] block: Get rid of bdrv_swap() Kevin Wolf
2015-09-17 13:48 ` [Qemu-devel] [PATCH 01/16] block: Introduce BDS.file_child Kevin Wolf
2015-09-22 17:14 ` Max Reitz
2015-09-22 17:17 ` Max Reitz
2015-09-23 14:26 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 02/16] vmdk: Use BdrvChild instead of BDS for references to extents Kevin Wolf
2015-09-22 17:45 ` Max Reitz
2015-09-23 13:23 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 03/16] blkverify: Convert s->test_file to BdrvChild Kevin Wolf
2015-09-22 17:51 ` Max Reitz
2015-09-23 13:01 ` Alberto Garcia
2015-09-23 13:58 ` Kevin Wolf
2015-09-23 14:05 ` Alberto Garcia
2015-09-23 14:11 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 04/16] quorum: Convert " Kevin Wolf
2015-09-22 17:57 ` Max Reitz
2015-09-23 12:48 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 05/16] block: Convert bs->file " Kevin Wolf
2015-09-22 18:36 ` Max Reitz
2015-09-23 13:13 ` Kevin Wolf
2015-09-23 14:54 ` Alberto Garcia
2015-09-25 14:09 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 06/16] block: Remove bdrv_open_image() Kevin Wolf
2015-09-22 18:38 ` Max Reitz
2015-09-23 13:10 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 07/16] block: Convert bs->backing_hd to BdrvChild Kevin Wolf
2015-09-22 19:21 ` Max Reitz
2015-09-17 13:48 ` [Qemu-devel] [PATCH 08/16] block: Manage backing file references in bdrv_set_backing_hd() Kevin Wolf
2015-09-23 15:22 ` Max Reitz
2015-09-28 12:29 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 09/16] block: Split bdrv_move_feature_fields() Kevin Wolf
2015-09-23 16:36 ` Max Reitz
2015-09-29 13:37 ` Kevin Wolf
2015-09-30 14:51 ` Max Reitz
2015-09-17 13:48 ` [Qemu-devel] [PATCH 10/16] block/io: Make bdrv_requests_pending() public Kevin Wolf
2015-09-23 15:40 ` Max Reitz
2015-09-29 12:29 ` Kevin Wolf
2015-09-28 12:32 ` Alberto Garcia
2015-09-17 13:48 ` Kevin Wolf [this message]
2015-09-23 15:46 ` [Qemu-devel] [PATCH 11/16] block-backend: Add blk_set_bs() Max Reitz
2015-09-23 15:51 ` Kevin Wolf
2015-09-17 13:48 ` [Qemu-devel] [PATCH 12/16] block: Introduce parents list Kevin Wolf
2015-09-23 16:39 ` Max Reitz
2015-09-28 13:09 ` Alberto Garcia
2015-09-29 12:21 ` Kevin Wolf
2015-09-29 14:00 ` Alberto Garcia
2015-09-17 13:48 ` [Qemu-devel] [PATCH 13/16] block: Implement bdrv_append() without bdrv_swap() Kevin Wolf
2015-09-18 11:45 ` Alberto Garcia
2015-09-18 12:24 ` Kevin Wolf
2015-09-18 13:31 ` Alberto Garcia
2015-09-18 14:23 ` Kevin Wolf
2015-09-23 16:36 ` Max Reitz
2015-09-29 13:51 ` Kevin Wolf
2015-09-30 14:45 ` Max Reitz
2015-09-30 15:33 ` Kevin Wolf
2015-09-17 13:48 ` [Qemu-devel] [PATCH 14/16] blockjob: Store device name at job creation Kevin Wolf
2015-09-23 16:46 ` Max Reitz
2015-09-17 13:48 ` [Qemu-devel] [PATCH 15/16] block: Add and use bdrv_replace_in_backing_chain() Kevin Wolf
2015-09-23 17:08 ` Max Reitz
2015-09-29 15:22 ` Kevin Wolf
2015-09-30 14:50 ` Max Reitz
2015-09-30 14:50 ` Max Reitz
2015-09-17 13:48 ` [Qemu-devel] [PATCH 16/16] block: Remove bdrv_swap() Kevin Wolf
2015-09-23 17:09 ` Max Reitz
2015-09-28 13:24 ` Alberto Garcia
2015-09-18 11:03 ` [Qemu-devel] [PATCH 00/16] block: Get rid of bdrv_swap() Alberto Garcia
2015-09-22 10:07 ` Kevin Wolf
2015-09-24 18:32 ` Alberto Garcia
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=1442497700-2536-12-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=jcody@redhat.com \
--cc=mreitz@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).