From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v2 3/4] block: Add blk_make_empty()
Date: Wed, 29 Apr 2020 16:11:25 +0200 [thread overview]
Message-ID: <20200429141126.85159-4-mreitz@redhat.com> (raw)
In-Reply-To: <20200429141126.85159-1-mreitz@redhat.com>
Two callers of BlockDriver.bdrv_make_empty() remain that should not call
this method directly. Both do not have access to a BdrvChild, but they
can use a BlockBackend, so we add this function that lets them use it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
include/sysemu/block-backend.h | 2 ++
block/block-backend.c | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 0917663d89..8203d7f6f9 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -266,4 +266,6 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
const BdrvChild *blk_root(BlockBackend *blk);
+int blk_make_empty(BlockBackend *blk, Error **errp);
+
#endif
diff --git a/block/block-backend.c b/block/block-backend.c
index f4944861fa..47bd56244d 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -2402,3 +2402,13 @@ const BdrvChild *blk_root(BlockBackend *blk)
{
return blk->root;
}
+
+int blk_make_empty(BlockBackend *blk, Error **errp)
+{
+ if (!blk_is_available(blk)) {
+ error_setg(errp, "No medium inserted");
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_make_empty(blk->root, errp);
+}
--
2.25.4
next prev parent reply other threads:[~2020-04-29 14:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 14:11 [PATCH v2 0/4] block: Do not call BlockDriver.bdrv_make_empty() directly Max Reitz
2020-04-29 14:11 ` [PATCH v2 1/4] block: Add bdrv_make_empty() Max Reitz
2020-04-29 14:51 ` Eric Blake
2020-04-29 14:11 ` [PATCH v2 2/4] block: Use bdrv_make_empty() where possible Max Reitz
2020-04-29 14:11 ` Max Reitz [this message]
2020-04-29 14:52 ` [PATCH v2 3/4] block: Add blk_make_empty() Eric Blake
2020-04-29 14:11 ` [PATCH v2 4/4] block: Use blk_make_empty() after commits Max Reitz
2020-04-29 14:17 ` Max Reitz
2020-04-29 14:55 ` Eric Blake
2020-04-29 19:07 ` [PATCH v2 0/4] block: Do not call BlockDriver.bdrv_make_empty() directly no-reply
2020-04-29 19:11 ` no-reply
2020-04-29 19:15 ` no-reply
2020-04-29 23:37 ` no-reply
2020-04-29 23:41 ` no-reply
2020-05-14 13:08 ` Kevin Wolf
2020-05-15 10:36 ` 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=20200429141126.85159-4-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=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).