migration: trivialities
cover migration: trivialities
SSIA; originally for RHBZ#2018404 (hence the links in the commit messages).
Laszlo Ersek (2):
migration: factor out "resume_requested" in qmp_migrate()
migration: unexport migrate_fd_error()
migration/migration.h | 1 - migration/migration.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-)
base-commit: 2a6ae69154542caa91dd17c40fd3f5ffbec300de
PATCH 1/2 migration: factor out "resume_requested" in qmp_migrate()
It cuts back on those awkward, duplicated !(has_resume && resume) expressions.
Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
--- migration/migration.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
migration/migration.c +6 -4
@@ -1637,6 +1637,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, bool has_inc, bool inc, bool has_detach, bool detach, bool has_resume, bool resume, Error **errp) { + bool resume_requested;Error *local_err =NULL ;MigrationState *s =migrate_get_current ();const char *p =NULL ;
@@ -1646,13 +1647,14 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,return ; } + resume_requested = has_resume && resume;if (!migrate_prepare (s, has_blk && blk, has_inc && inc, - has_resume && resume, errp)) { + resume_requested, errp)) {/* Error detected, put into errp */ return ; } -if (!(has_resume && resume)) { +if (!resume_requested) {if (!yank_register_instance (MIGRATION_YANK_INSTANCE , errp)) {return ; }
@@ -1671,7 +1673,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, }else if (strstart (uri,"fd:" , &p)) {fd_start_outgoing_migration (s, p, &local_err); }else { -if (!(has_resume && resume)) { +if (!resume_requested) {yank_unregister_instance (MIGRATION_YANK_INSTANCE ); } error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
@@ -1683,7 +1685,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, }if (local_err) { -if (!(has_resume && resume)) { +if (!resume_requested) {yank_unregister_instance (MIGRATION_YANK_INSTANCE ); }migrate_fd_error (s, local_err);
Re: [PATCH 1/2] migration: factor out "resume_requested" in qmp_migrate()
Quoted 9 lines · Laszlo Ersek
It cuts back on those awkward, duplicated !(has_resume && resume) expressions.
Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404Signed-off-by Laszlo Ersek <[email protected]>
Thanks.
queued.
Re: [PATCH 1/2] migration: factor out "resume_requested" in qmp_migrate()
In reply to Laszlo Ersek06.07.2023 13:29, Laszlo Ersek пишет:
Quoted 26 lines
It cuts back on those awkward, duplicated !(has_resume && resume) expressions.
Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404Signed-off-by Laszlo Ersek <[email protected]>--- migration/migration.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)migration/migration.c +1
-0@@ -1637,6 +1637,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, bool has_inc, bool inc, bool has_detach, bool detach, bool has_resume, bool resume, Error **errp) { + bool resume_requested;Error *local_err =NULL ;MigrationState *s =migrate_get_current ();const char *p =NULL ;
migration/migration.c void qmp_migrate(const char *uri, bool has_blk, bool blk, · line 1650
Quoted 4 lines
migration/migration.c +1
-0@@ -1646,13 +1647,14 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,return ; } + resume_requested = has_resume && resume;
Dunno if it's worth it or cleaner, but it can be reduced to
if (!has_resume) resume = false;
and checking for only resume below this point.
In other words, there's no need for an additional local var.
All other params (has_inc & inc, has_detach_detach etc) are like this too.
Anyway,
/mjt
Re: [PATCH 1/2] migration: factor out "resume_requested" in qmp_migrate()
Quoted 35 lines · Michael Tokarev
06.07.2023 13:29, Laszlo Ersek пишет:
Quoted 27 lines
It cuts back on those awkward, duplicated !(has_resume && resume) expressions.
Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404Signed-off-by Laszlo Ersek <[email protected]>---
migration/migration.c| 10 ++++++----1 file changed, 6 insertions(+), 4 deletions(-)migration/migration.c +1
-0@@ -1637,6 +1637,7 @@ void qmp_migrate(const char *uri, bool has_blk,bool blk, bool has_inc, bool inc, bool has_detach, bool detach, bool has_resume, bool resume, Error **errp) { + bool resume_requested; Error *local_err = NULL; MigrationState *s = migrate_get_current();const char *p = NULL;
migration/migration.c void qmp_migrate(const char *uri, bool · line 1650
Quoted 4 lines
migration/migration.c +0
-0@@ -1646,13 +1647,14 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, return; } + resume_requested = has_resume && resume;Dunno if it's worth it or cleaner, but it can be reduced to
Quoted 4 lines
if (!has_resume) resume = false;
and checking for only resume below this point.
In other words, there's no need for an additional local var.
I vehemently disagree with overwriting (input) parameters. One situation where that practice is a disaster is single-stepping through the function in an interactive debugger. You won't see the actual argument the function was originally called with.
I know it's sometimes comfortable to just reuse a "count" input paramater as a loop index that runs to zero -- I resist that too, it's a trap (for the same reason), IMO.
Quoted 7 lines
All other params (
has_inc& inc,has_detach_detachetc) are like this too.Anyway,
Reviewed-by Michael Tokarev <[email protected]>
Thanks!
Laszlo
Re: [PATCH 1/2] migration: factor out "resume_requested" in qmp_migrate()
In reply to Laszlo ErsekQuoted 8 lines · Laszlo Ersek
It cuts back on those awkward, duplicated !(has_resume && resume) expressions.
Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
Quoted 4 lines
Signed-off-by Laszlo Ersek <[email protected]>--- migration/migration.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
PATCH 2/2 migration: unexport migrate_fd_error()
In reply to Laszlo ErsekThe only migrate_fd_error() call sites are in "migration/migration.c", which is also where we define migrate_fd_error(). Make the function static, and remove its declaration from "migration/migration.h".
Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
--- migration/migration.h | 1 - migration/migration.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
migration/migration.h +0 -1
@@ -466,7 +466,6 @@ bool migration_has_all_channels(void);uint64_t migrate_max_downtime (void );void migrate_set_error (MigrationState *s,const Error *error); -void migrate_fd_error (MigrationState *s,const Error *error);void migrate_fd_connect (MigrationState *s,Error *error_in);
migration/migration.c +1 -1
@@ -1220,7 +1220,7 @@ static void migrate_error_free(MigrationState *s) } } -void migrate_fd_error (MigrationState *s,const Error *error) +static void migrate_fd_error (MigrationState *s,const Error *error) {trace_migrate_fd_error (error_get_pretty (error));assert (s->to_dst_file ==NULL );
Re: [PATCH 2/2] migration: unexport migrate_fd_error()
Quoted 10 lines · Laszlo Ersek
The only
migrate_fd_error()call sites are in "migration/migration.c", which is also where we definemigrate_fd_error(). Make the function static, and remove its declaration from "migration/migration.h".Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404Signed-off-by Laszlo Ersek <[email protected]>
queued.
Re: [PATCH 2/2] migration: unexport migrate_fd_error()
In reply to Laszlo ErsekQuoted 9 lines · Laszlo Ersek
The only
migrate_fd_error()call sites are in "migration/migration.c", which is also where we definemigrate_fd_error(). Make the function static, and remove its declaration from "migration/migration.h".Cc: Juan Quintela <[email protected]> (maintainer:Migration)
Cc: Leonardo Bras <[email protected]> (reviewer:Migration)
Cc: Peter Xu <[email protected]> (reviewer:Migration)
Cc: [email protected]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
Quoted 5 lines
Signed-off-by Laszlo Ersek <[email protected]>--- migration/migration.h | 1 - migration/migration.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
Quoted 11 lines · Laszlo Ersek
SSIA; originally for RHBZ#2018404 (hence the links in the commit messages).
Cc Juan Quintela <[email protected]> (maintainer:Migration)Cc Leonardo Bras <[email protected]> (reviewer:Migration)Cc Peter Xu <[email protected]> (reviewer:Migration)Laszlo Ersek (2):
migration: factor out "resume_requested" inqmp_migrate()
migration: unexportmigrate_fd_error()
Signature · 1 line
Peter Xu
Michael Tokarev
AppliedQuoted 8 lines · Laszlo Ersek
SSIA; originally for RHBZ#2018404 (hence the links in the commit messages).
Cc Juan Quintela <[email protected]> (maintainer:Migration)Cc Leonardo Bras <[email protected]> (reviewer:Migration)Cc Peter Xu <[email protected]> (reviewer:Migration)
Quoted 7 lines
Laszlo Ersek (2):
migration: factor out "resume_requested" inqmp_migrate()
migration: unexportmigrate_fd_error()migration/migration.h | 1 - migration/migration.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-)
Applied to trivial-patches tree, thanks!
/mjt