From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202602 header.b=XsmHffwf; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 6A7CF5A0265 for ; Tue, 03 Mar 2026 02:53:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1772502807; bh=MlxgFssJKXCKTi13vlzGb+Rir/E6KqWrw7eIXN+Ukrk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XsmHffwf3qhpAyC7Wq6C/NUANpZjeT78VfyM0IzgBu4aqaQad0R341cIvjReOOoFr 02kjuPqJ9GoKftBcc30FJeEsWHuv9VI+E0yCZyZatZ6Jka+T8EJI7dBq1YgAxcr3LN bK8brhCjJvIV445rOZ5UoFDs9MblUetJvp6m+y91XnpHXuQh7rhlX378MBM9e5FJ21 U8U0pREWeM1whk2EAg1eZ85tJPFmUCue/H7/pnqgGFFw3z9cH8WCnlevMwuaAqwSWw q0m8i4gBr0sGjeGYWDP0tOPl8Meju4ZvgxCqssmq6RQaEdsqUe3FlyP4hc6VewNWDC 2GCi9IsKcP8Zg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4fPzNR0y8gz4wBF; Tue, 03 Mar 2026 12:53:27 +1100 (AEDT) Date: Tue, 3 Mar 2026 12:53:23 +1100 From: David Gibson To: Jon Maloy Subject: Re: [PATCH v5 09/13] migrate: Rename v1 address functions to v2 for clarity Message-ID: References: <20260222174445.743845-1-jmaloy@redhat.com> <20260222174445.743845-10-jmaloy@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0x9plUGjZbFdfiGD" Content-Disposition: inline In-Reply-To: <20260222174445.743845-10-jmaloy@redhat.com> Message-ID-Hash: 7RKXIPKXTOJSXFW4GNX6TMYQO7L36F3M X-Message-ID-Hash: 7RKXIPKXTOJSXFW4GNX6TMYQO7L36F3M X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: sbrivio@redhat.com, dgibson@redhat.com, passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --0x9plUGjZbFdfiGD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Jon Maloy > Reviewed-by: David Gibson 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(-) >=20 > 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 > =20 > /** > - * struct migrate_seen_addrs_v1 - Migratable guest addresses for v1 stat= e stream > + * struct migrate_seen_addrs_v2 - Migratable guest addresses for v2 prot= ocol > * @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)); > =20 > /** > - * 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 =3D { 0 }; > + struct migrate_seen_addrs_v2 addrs =3D { 0 }; > const struct inany_addr_entry *e; > =20 > (void)stage; > @@ -84,17 +84,17 @@ static int seen_addrs_source_v1(struct ctx *c, > } > =20 > /** > - * 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; > =20 > @@ -126,8 +126,8 @@ static int seen_addrs_target_v1(struct ctx *c, > static const struct migrate_stage stages_v2[] =3D { > { > .name =3D "observed addresses", > - .source =3D seen_addrs_source_v1, > - .target =3D seen_addrs_target_v1, > + .source =3D seen_addrs_source_v2, > + .target =3D seen_addrs_target_v2, > }, > { > .name =3D "prepare flows", > --=20 > 2.52.0 >=20 --=20 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 --0x9plUGjZbFdfiGD Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmmmPxIACgkQzQJF27ox 2GdRJw//b1pp7Etrpay2j6FyZ+0H8SLeTQO4WrzLikuU8Z2HvBqiF4YEuUycB6nL 1YRCw2o3JXZccWgX84VMQ5faNZPB6wNe5ibziEN3hUdtGO6ot8cup3iiXse5i2Pp Yg9b/ZRWQv0JiwVguPTLO3WW212yR3L8/psq/2vSR7sepH2vQO1wA6Ypt1Sk+m34 1rKjkF78wkN+0qAArmtoweYb/FGkFaAfz3YWhi67w8H13T+7ytjaEj198kIlCOil 2SO1p/RWdQE8sY4It68rBHknNYjwPFbdVySYQ4TSBGTk5vMw+4+8ycy69kBvnGYW nppMB7WrMGOvSGjwEA6h27LJgEixV1u61b0DTbnWJk1qsgzDEI41eTTocTJxF6R8 8wE/j5gj9uD29A853iNOjg3Sk1RyAkCRazxFew+HC+i+AD3nh/NjArlGk6tFZ2nW dvkIZRLVHAYzC020s6GitwUxGmhzgp2hjDJxEnU10JV+0wm8XGXvbAYKLeBTdYyk m4EhfUUVKFFXZf3DQyddMTtXF2xkSHTq445U6m13/0yQNG3/PiXeJG8DfRKQoHUf P23ydY6lUBAxA3N15ZSUnUDQiAYAKIb9yyVu1meac5b8EwX6iepuxNElbiHqeaHN Me8PnotyDKVk5bBBuyR+1VBgqOBMHKNilAKiDxWIBVVQp62jz1U= =5Kve -----END PGP SIGNATURE----- --0x9plUGjZbFdfiGD--