[2/2] migration: unexport migrate_fd_error()

Commit Message

Laszlo Ersek July 6, 2023, 10:29 a.m. UTC

The 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 <[e-mail]> (maintainer:Migration)
Cc: Leonardo Bras <[e-mail]> (reviewer:Migration)
Cc: Peter Xu <[e-mail]> (reviewer:Migration)
Cc: [e-mail]
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
Signed-off-by: Laszlo Ersek <[e-mail]>
---
 migration/migration.h | 1 -
 migration/migration.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Juan Quintela July 6, 2023, 11:42 a.m. UTC | #1

Laszlo Ersek <[e-mail]> wrote:
> The 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 <[e-mail]> (maintainer:Migration)
> Cc: Leonardo Bras <[e-mail]> (reviewer:Migration)
> Cc: Peter Xu <[e-mail]> (reviewer:Migration)
> Cc: [e-mail]
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
> Signed-off-by: Laszlo Ersek <[e-mail]>

Reviewed-by: Juan Quintela <[e-mail]>

queued.

Philippe Mathieu-Daudé July 6, 2023, 4:44 p.m. UTC | #2

On 6/7/23 12:29, Laszlo Ersek wrote:
> The 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 <[e-mail]> (maintainer:Migration)
> Cc: Leonardo Bras <[e-mail]> (reviewer:Migration)
> Cc: Peter Xu <[e-mail]> (reviewer:Migration)
> Cc: [e-mail]
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2018404
> Signed-off-by: Laszlo Ersek <[e-mail]>
> ---
>   migration/migration.h | 1 -
>   migration/migration.c | 2 +-
>   2 files changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

diff --git a/migration/migration.h b/migration/migration.h
index a80b22b703cd..b7c8b67542b8 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -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);
 
diff --git a/migration/migration.c b/migration/migration.c
index a60a5acee533..91bba630a828 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -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);