From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>,
Laurent Vivier <lvivier@redhat.com>
Subject: [PATCH v3 2/5] migrate: Don't use terminator element for versions[] array
Date: Wed, 7 Jan 2026 12:46:03 +1100 [thread overview]
Message-ID: <20260107014606.1513722-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20260107014606.1513722-1-david@gibson.dropbear.id.au>
When scanning the versions[] array we use a dummy entry to detect when
we're finished. Use ARRAY_SIZE() instead, which is almost as easy, a
little safer, and doesn't cause clang-tidy 21.1.7 to complain.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
---
migrate.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/migrate.c b/migrate.c
index 48d63a07..13bacab7 100644
--- a/migrate.c
+++ b/migrate.c
@@ -123,7 +123,6 @@ static const struct migrate_version versions[] = {
* MSS and omitted timestamps, which meant it usually wouldn't work.
* Therefore we don't attempt to support compatibility with it.
*/
- { 0 },
};
/* Current encoding version */
@@ -177,9 +176,9 @@ static int migrate_source(struct ctx *c, int fd)
*/
static const struct migrate_version *migrate_target_read_header(int fd)
{
- const struct migrate_version *v;
struct migrate_header h;
uint32_t id, compat_id;
+ unsigned i;
if (read_all_buf(fd, &h, sizeof(h)))
return NULL;
@@ -196,9 +195,9 @@ static const struct migrate_version *migrate_target_read_header(int fd)
return NULL;
}
- for (v = versions; v->id; v++)
- if (v->id <= id && v->id >= compat_id)
- return v;
+ for (i = 0; i < ARRAY_SIZE(versions); i++)
+ if (versions[i].id <= id && versions[i].id >= compat_id)
+ return &versions[i];
errno = ENOTSUP;
err("Unsupported device state version: %u", id);
--
2.52.0
next prev parent reply other threads:[~2026-01-07 1:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-07 1:46 [PATCH v3 0/5] Fixes for Fedora 43 David Gibson
2026-01-07 1:46 ` [PATCH v3 1/5] util: Be more defensive about buffer overruns in read_file() David Gibson
2026-01-07 1:46 ` David Gibson [this message]
2026-01-07 1:46 ` [PATCH v3 3/5] treewide: Don't rely on terminator records in ip[46].dns arrays David Gibson
2026-01-07 1:46 ` [PATCH v3 4/5] test: Handle Operating System Command escapes in terminal output David Gibson
2026-01-07 1:46 ` [PATCH v3 5/5] test: Include sshd-auth in mbuto guest image David Gibson
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=20260107014606.1513722-3-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/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.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
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 IMAP folder(s).