From: Stefan Weil Date: Tue, 9 Dec 2025 12:50:49 +0000 (+0100) Subject: migration: Fix order of function arguments X-Git-Tag: v10.2.0-rc3~1^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bc6fa244618b3a70cc09c328c4e7d0625a11a96;p=thirdparty%2Fqemu.git migration: Fix order of function arguments This fixes a compiler error when higher warning levels are enabled: ../migration/postcopy-ram.c: In function ‘postcopy_temp_pages_setup’: ../migration/postcopy-ram.c:1483:50: error: ‘g_malloc0_n’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] 1483 | mis->postcopy_tmp_pages = g_malloc0_n(sizeof(PostcopyTmpPage), channels); | ^~~~~~~~~~~~~~~ ../migration/postcopy-ram.c:1483:50: note: earlier argument should specify number of elements, later size of each element Avoid also a related int/unsigned mismatch by fixing the type of two local variables. Signed-off-by: Stefan Weil Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20251209125049.764095-1-sw@weilnetz.de> [PMD: Replace g_malloc0_n() by g_new0()] Signed-off-by: Philippe Mathieu-Daudé Acked-by: Peter Xu Message-Id: <20251209195010.83219-1-philmd@linaro.org> --- diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 7c9fe61041..715ef021a9 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -1467,7 +1467,8 @@ retry: static int postcopy_temp_pages_setup(MigrationIncomingState *mis) { PostcopyTmpPage *tmp_page; - int err, i, channels; + int err; + unsigned i, channels; void *temp_page; if (migrate_postcopy_preempt()) { @@ -1479,7 +1480,7 @@ static int postcopy_temp_pages_setup(MigrationIncomingState *mis) } channels = mis->postcopy_channels; - mis->postcopy_tmp_pages = g_malloc0_n(sizeof(PostcopyTmpPage), channels); + mis->postcopy_tmp_pages = g_new0(PostcopyTmpPage, channels); for (i = 0; i < channels; i++) { tmp_page = &mis->postcopy_tmp_pages[i];