fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migration: Fix order of function arguments

Browse source 
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 <sw@weilnetz.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20251209125049.764095-1-sw@weilnetz.de>
[PMD: Replace g_malloc0_n() by g_new0()]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Peter Xu <peterx@redhat.com>
Message-Id: <20251209195010.83219-1-philmd@linaro.org>
This commit is contained in:
Stefan Weil 2025-12-09 13:50:49 +01:00 • committed by Philippe Mathieu-Daudé
parent 46228925ed
commit 0bc6fa2446
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
migration/postcopy-ram.c
View file

@ -1467,7 +1467,8 @@ retry:
static int postcopy_temp_pages_setup(MigrationIncomingState *mis) static int postcopy_temp_pages_setup(MigrationIncomingState *mis)
{ {
PostcopyTmpPage *tmp_page; PostcopyTmpPage *tmp_page;
int err, i, channels; int err;
unsigned i, channels;
void *temp_page; void *temp_page;
if (migrate_postcopy_preempt()) { if (migrate_postcopy_preempt()) {
@ -1479,7 +1480,7 @@ static int postcopy_temp_pages_setup(MigrationIncomingState *mis)
} }
channels = mis->postcopy_channels; 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++) { for (i = 0; i < channels; i++) {
tmp_page = &mis->postcopy_tmp_pages[i]; tmp_page = &mis->postcopy_tmp_pages[i];