From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peterx@redhat.com, farosas@suse.de, berrange@redhat.com,
guobin@linux.alibaba.com
Subject: [PATCH 3/3] migration: Put Error **errp parameter last
Date: Mon, 27 Oct 2025 07:45:03 +0100 [thread overview]
Message-ID: <20251027064503.1074255-4-armbru@redhat.com> (raw)
In-Reply-To: <20251027064503.1074255-1-armbru@redhat.com>
qapi/error.h's big comment:
* - Functions that use Error to report errors have an Error **errp
* parameter. It should be the last parameter, except for functions
* taking variable arguments.
is_only_migratable() and add_blockers() have it in the middle. Clean
them up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/migration.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 5f1c83aafd..8a06b54167 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1867,7 +1867,7 @@ static bool is_busy(Error **reasonp, Error **errp)
return false;
}
-static bool is_only_migratable(Error **reasonp, Error **errp, unsigned modes)
+static bool is_only_migratable(Error **reasonp, unsigned modes, Error **errp)
{
ERRP_GUARD();
@@ -1881,7 +1881,7 @@ static bool is_only_migratable(Error **reasonp, Error **errp, unsigned modes)
return false;
}
-static int add_blockers(Error **reasonp, Error **errp, unsigned modes)
+static int add_blockers(Error **reasonp, unsigned modes, Error **errp)
{
for (MigMode mode = 0; mode < MIG_MODE__MAX; mode++) {
if (modes & BIT(mode)) {
@@ -1904,12 +1904,12 @@ int migrate_add_blocker_normal(Error **reasonp, Error **errp)
int migrate_add_blocker_modes(Error **reasonp, unsigned modes, Error **errp)
{
- if (is_only_migratable(reasonp, errp, modes)) {
+ if (is_only_migratable(reasonp, modes, errp)) {
return -EACCES;
} else if (is_busy(reasonp, errp)) {
return -EBUSY;
}
- return add_blockers(reasonp, errp, modes);
+ return add_blockers(reasonp, modes, errp);
}
int migrate_add_blocker_internal(Error **reasonp, Error **errp)
@@ -1919,7 +1919,7 @@ int migrate_add_blocker_internal(Error **reasonp, Error **errp)
if (is_busy(reasonp, errp)) {
return -EBUSY;
}
- return add_blockers(reasonp, errp, modes);
+ return add_blockers(reasonp, modes, errp);
}
void migrate_del_blocker(Error **reasonp)
--
2.49.0
next prev parent reply other threads:[~2025-10-27 9:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-27 6:45 [PATCH 0/3] migration: Cleanup around MigMode sets Markus Armbruster
2025-10-27 6:45 ` [PATCH 1/3] migration: Use unsigned instead of int for bit set of MigMode Markus Armbruster
2025-10-27 6:45 ` [PATCH 2/3] migration: Use bitset of MigMode instead of variable arguments Markus Armbruster
2025-10-27 6:45 ` Markus Armbruster [this message]
2025-10-27 13:24 ` [PATCH 0/3] migration: Cleanup around MigMode sets Fabiano Rosas
2025-10-28 15:19 ` Peter Xu
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=20251027064503.1074255-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=farosas@suse.de \
--cc=guobin@linux.alibaba.com \
--cc=peterx@redhat.com \
--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).