On Sun, Feb 22, 2026 at 12:44:41PM -0500, Jon Maloy wrote:
> Some migration address structures and functions have a _v1 suffix.
> This is confusing, since they are currently handling version 2 of
> the migration protocol. We are now going to introduce a new version
> 3 of the protocol, so we choose to give these functions the correct
> suffix _v2 instead. This is in correspondence with current reality,
> and will help make a clearer distinction between the old and the new
> versions of those functions.
> 
> Signed-off-by: Jon Maloy <jmaloy@redhat.com>
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

Stefano, this is a sensible cleanup independent of the rest of the
series.  Please apply.

> ---
>  migrate.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/migrate.c b/migrate.c
> index 1e2830f..1990067 100644
> --- a/migrate.c
> +++ b/migrate.c
> @@ -31,13 +31,13 @@
>  #define MIGRATE_MAGIC		0xB1BB1D1B0BB1D1B0
>  
>  /**
> - * struct migrate_seen_addrs_v1 - Migratable guest addresses for v1 state stream
> + * struct migrate_seen_addrs_v2 - Migratable guest addresses for v2 protocol
>   * @addr6:	Observed guest IPv6 address
>   * @addr6_ll:	Observed guest IPv6 link-local address
>   * @addr4:	Observed guest IPv4 address
>   * @mac:	Observed guest MAC address
>   */
> -struct migrate_seen_addrs_v1 {
> +struct migrate_seen_addrs_v2 {
>  	struct in6_addr addr6;
>  	struct in6_addr addr6_ll;
>  	struct in_addr addr4;
> @@ -45,7 +45,7 @@ struct migrate_seen_addrs_v1 {
>  } __attribute__((packed));
>  
>  /**
> - * seen_addrs_source_v1() - Copy and send guest observed addresses from source
> + * seen_addrs_source_v2() - Copy and send guest observed addresses from source
>   * @c:		Execution context
>   * @stage:	Migration stage, unused
>   * @fd:		File descriptor for state transfer
> @@ -53,10 +53,10 @@ struct migrate_seen_addrs_v1 {
>   * Return: 0 on success, positive error code on failure
>   */
>  /* cppcheck-suppress [constParameterCallback, unmatchedSuppression] */
> -static int seen_addrs_source_v1(struct ctx *c,
> +static int seen_addrs_source_v2(struct ctx *c,
>  				const struct migrate_stage *stage, int fd)
>  {
> -	struct migrate_seen_addrs_v1 addrs = { 0 };
> +	struct migrate_seen_addrs_v2 addrs = { 0 };
>  	const struct inany_addr_entry *e;
>  
>  	(void)stage;
> @@ -84,17 +84,17 @@ static int seen_addrs_source_v1(struct ctx *c,
>  }
>  
>  /**
> - * seen_addrs_target_v1() - Receive and use guest observed addresses on target
> + * seen_addrs_target_v2() - Receive and use guest observed addresses on target
>   * @c:		Execution context
>   * @stage:	Migration stage, unused
>   * @fd:		File descriptor for state transfer
>   *
>   * Return: 0 on success, positive error code on failure
>   */
> -static int seen_addrs_target_v1(struct ctx *c,
> +static int seen_addrs_target_v2(struct ctx *c,
>  				const struct migrate_stage *stage, int fd)
>  {
> -	struct migrate_seen_addrs_v1 addrs;
> +	struct migrate_seen_addrs_v2 addrs;
>  	struct in6_addr addr6, addr6_ll;
>  	struct in_addr addr4;
>  
> @@ -126,8 +126,8 @@ static int seen_addrs_target_v1(struct ctx *c,
>  static const struct migrate_stage stages_v2[] = {
>  	{
>  		.name = "observed addresses",
> -		.source = seen_addrs_source_v1,
> -		.target = seen_addrs_target_v1,
> +		.source = seen_addrs_source_v2,
> +		.target = seen_addrs_target_v2,
>  	},
>  	{
>  		.name = "prepare flows",
> -- 
> 2.52.0
> 

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson