qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 15/29] block-backend: Add blk_set_bs()
Date: Fri, 16 Oct 2015 17:06:00 +0200	[thread overview]
Message-ID: <1445007974-11433-16-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1445007974-11433-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>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/block-backend.c     | 17 +++++++++++++++++
 include/block/block_int.h |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/block/block-backend.c b/block/block-backend.c
index c2e8732..2256551 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -239,6 +239,23 @@ 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);
+    }
+    assert(bs->blk == NULL);
+
+    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

  parent reply	other threads:[~2015-10-16 15:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-16 15:05 [Qemu-devel] [PULL 00/29] Block layer patches Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 01/29] iotests: disable core dumps in test 061 Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 02/29] throttle: test that snapshots move the throttling configuration Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 03/29] qmp-commands.hx: Update the supported 'transaction' operations Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 04/29] block: qemu-iotests - fix vmdk test 059.out Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 05/29] block: Introduce BDS.file_child Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 06/29] vmdk: Use BdrvChild instead of BDS for references to extents Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 07/29] blkverify: Convert s->test_file to BdrvChild Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 08/29] quorum: Convert " Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 09/29] block: Convert bs->file " Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 10/29] block: Remove bdrv_open_image() Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 11/29] block: Convert bs->backing_hd to BdrvChild Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 12/29] block: Manage backing file references in bdrv_set_backing_hd() Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 13/29] block: Split bdrv_move_feature_fields() Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 14/29] block/io: Make bdrv_requests_pending() public Kevin Wolf
2015-10-16 15:06 ` Kevin Wolf [this message]
2015-10-16 15:06 ` [Qemu-devel] [PULL 16/29] block: Introduce parents list Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 17/29] block: Implement bdrv_append() without bdrv_swap() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 18/29] blockjob: Store device name at job creation Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 19/29] block: Add and use bdrv_replace_in_backing_chain() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 20/29] block: Remove bdrv_swap() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 21/29] block: Allow bdrv_unref_child(bs, NULL) Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 22/29] blkverify: Fix BDS leak in .bdrv_open error path Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 23/29] util - add automated ID generation utility Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 24/29] block: auto-generated node-names Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 25/29] raw-posix: warn about BDRV_O_NATIVE_AIO if libaio is unavailable Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 26/29] blockdev: always compile in -drive aio= parsing Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 27/29] qemu-nbd: always compile in --aio=MODE option Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 28/29] qcow2: Remove forward declaration of QCowAIOCB Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 29/29] blkdebug: Don't confuse image as backing file Kevin Wolf
2015-10-18  9:57 ` [Qemu-devel] [PULL 00/29] Block layer patches Peter Maydell

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=1445007974-11433-16-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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).