From: Fiona Ebner <f.ebner@proxmox.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, armbru@redhat.com, eblake@redhat.com,
hreitz@redhat.com, kwolf@redhat.com, vsementsov@yandex-team.ru,
jsnow@redhat.com, den@virtuozzo.com, t.lamprecht@proxmox.com,
alexander.ivanov@virtuozzo.com
Subject: [PATCH v2 05/10] mirror: implement mirror_change method
Date: Mon, 9 Oct 2023 11:46:14 +0200 [thread overview]
Message-ID: <20231009094619.469668-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20231009094619.469668-1-f.ebner@proxmox.com>
which allows switching the @copy-mode from 'background' to
'write-blocking'.
This is useful for management applications, so they can start out in
background mode to avoid limiting guest write speed and switch to
active mode when certain criteria are fulfilled.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
Changes in v2:
* update QEMU version in QAPI
* update indentation in QAPI (like in a937b6aa73 ("qapi: Reformat
doc comments to conform to current conventions"))
* drop drained section and disable dirty bitmap call. It's already
disabled, because the bitmap is now attached to the filter and
set in bdrv_mirror_top_do_write(). See the earlier patch
"block/mirror: move dirty bitmap to filter"
block/mirror.c | 22 ++++++++++++++++++++++
qapi/block-core.json | 13 ++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index b84de56734..83aa4176c2 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1246,6 +1246,27 @@ static bool commit_active_cancel(Job *job, bool force)
return force || !job_is_ready(job);
}
+static void mirror_change(BlockJob *job, BlockJobChangeOptions *opts,
+ Error **errp)
+{
+ MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
+ BlockJobChangeOptionsMirror *change_opts = &opts->u.mirror;
+
+ if (s->copy_mode == change_opts->copy_mode) {
+ return;
+ }
+
+ if (s->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING) {
+ error_setg(errp, "Cannot switch away from copy mode 'write-blocking'");
+ return;
+ }
+
+ assert(s->copy_mode == MIRROR_COPY_MODE_BACKGROUND &&
+ change_opts->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING);
+
+ s->copy_mode = MIRROR_COPY_MODE_WRITE_BLOCKING;
+}
+
static const BlockJobDriver mirror_job_driver = {
.job_driver = {
.instance_size = sizeof(MirrorBlockJob),
@@ -1260,6 +1281,7 @@ static const BlockJobDriver mirror_job_driver = {
.cancel = mirror_cancel,
},
.drained_poll = mirror_drained_poll,
+ .change = mirror_change,
};
static const BlockJobDriver commit_active_job_driver = {
diff --git a/qapi/block-core.json b/qapi/block-core.json
index c6f31a9399..01427c259a 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3044,6 +3044,17 @@
{ 'command': 'block-job-finalize', 'data': { 'id': 'str' },
'allow-preconfig': true }
+##
+# @BlockJobChangeOptionsMirror:
+#
+# @copy-mode: Switch to this copy mode. Currenlty, only the switch
+# from 'background' to 'write-blocking' is implemented.
+#
+# Since: 8.2
+##
+{ 'struct': 'BlockJobChangeOptionsMirror',
+ 'data': { 'copy-mode' : 'MirrorCopyMode' } }
+
##
# @BlockJobChangeOptions:
#
@@ -3058,7 +3069,7 @@
{ 'union': 'BlockJobChangeOptions',
'base': { 'id': 'str', 'type': 'JobType' },
'discriminator': 'type',
- 'data': {} }
+ 'data': { 'mirror': 'BlockJobChangeOptionsMirror' } }
##
# @block-job-change:
--
2.39.2
next prev parent reply other threads:[~2023-10-09 9:48 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 9:46 [PATCH v2 00/10] mirror: allow switching from background to active mode Fiona Ebner
2023-10-09 9:46 ` [PATCH v2 01/10] blockjob: introduce block-job-change QMP command Fiona Ebner
2023-10-10 18:04 ` Vladimir Sementsov-Ogievskiy
2023-10-09 9:46 ` [PATCH v2 02/10] block/mirror: set actively_synced even after the job is ready Fiona Ebner
2023-10-09 9:46 ` [PATCH v2 03/10] block/mirror: move dirty bitmap to filter Fiona Ebner
2023-10-10 19:10 ` Vladimir Sementsov-Ogievskiy
2023-10-09 9:46 ` [PATCH v2 04/10] block/mirror: determine copy_to_target only once Fiona Ebner
2023-10-10 19:23 ` Vladimir Sementsov-Ogievskiy
2023-10-09 9:46 ` Fiona Ebner [this message]
2023-10-10 19:37 ` [PATCH v2 05/10] mirror: implement mirror_change method Vladimir Sementsov-Ogievskiy
2023-10-11 11:22 ` Fiona Ebner
2023-10-12 13:54 ` Vladimir Sementsov-Ogievskiy
2023-10-09 9:46 ` [PATCH v2 06/10] qapi/block-core: use JobType for BlockJobInfo's type Fiona Ebner
2023-10-09 9:46 ` [PATCH v2 07/10] qapi/block-core: turn BlockJobInfo into a union Fiona Ebner
2023-10-09 9:46 ` [PATCH v2 08/10] blockjob: query driver-specific info via a new 'query' driver method Fiona Ebner
2023-10-10 19:51 ` Vladimir Sementsov-Ogievskiy
2023-10-09 9:46 ` [PATCH v2 09/10] mirror: return mirror-specific information upon query Fiona Ebner
2023-10-10 19:53 ` Vladimir Sementsov-Ogievskiy
2023-10-09 9:46 ` [PATCH v2 10/10] iotests: adapt test output for new mirror query property Fiona Ebner
2023-10-10 19:57 ` Vladimir Sementsov-Ogievskiy
2023-10-10 17:55 ` [PATCH v2 00/10] mirror: allow switching from background to active mode Vladimir Sementsov-Ogievskiy
2023-10-10 20:01 ` Vladimir Sementsov-Ogievskiy
2023-10-11 10:18 ` Fiona Ebner
2023-10-12 14:10 ` Vladimir Sementsov-Ogievskiy
2023-11-03 9:36 ` Markus Armbruster
2023-11-03 11:54 ` Kevin Wolf
2023-11-03 15:56 ` Markus Armbruster
2024-02-28 18:07 ` Vladimir Sementsov-Ogievskiy
2024-02-29 5:28 ` Markus Armbruster
2024-03-04 10:48 ` Kevin Wolf
2024-03-04 11:09 ` Peter Krempa
2024-03-07 19:42 ` Vladimir Sementsov-Ogievskiy
2024-03-08 8:21 ` Fiona Ebner
2024-03-08 8:52 ` Kevin Wolf
2024-03-11 15:15 ` Vladimir Sementsov-Ogievskiy
2024-03-12 13:44 ` Vladimir Sementsov-Ogievskiy
2024-03-12 15:49 ` Kevin Wolf
2024-03-12 18:52 ` Vladimir Sementsov-Ogievskiy
2024-03-10 21:07 ` Peter Krempa
2024-03-11 15:51 ` Vladimir Sementsov-Ogievskiy
2024-03-11 16:07 ` Peter Krempa
2024-03-04 12:27 ` Markus Armbruster
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=20231009094619.469668-6-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=alexander.ivanov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@virtuozzo.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=t.lamprecht@proxmox.com \
--cc=vsementsov@yandex-team.ru \
/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).