qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 05/10] migration: Fix order of function arguments
Date: Tue,  9 Dec 2025 21:05:32 +0100	[thread overview]
Message-ID: <20251209200537.84097-6-philmd@linaro.org> (raw)
In-Reply-To: <20251209200537.84097-1-philmd@linaro.org>

From: Stefan Weil <sw@weilnetz.de>

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>
---
 migration/postcopy-ram.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 7c9fe61041f..715ef021a91 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];
-- 
2.51.0



  parent reply	other threads:[~2025-12-09 20:06 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-09 20:05 [PULL 00/10] Misc HW patches for 2025-12-09 Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 01/10] osdep: Undefine FSCALE definition to fix Solaris builds Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 02/10] hw/9pfs: Correct typo Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 03/10] scripts: fix broken error path in modinfo-collect.py Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 04/10] vhost: Always initialize cached vring data Philippe Mathieu-Daudé
2025-12-09 20:05 ` Philippe Mathieu-Daudé [this message]
2025-12-09 20:05 ` [PULL 06/10] hw/pci: Fix typo in documentation Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 07/10] scripts/nsis.py: Tell makensis that WoA is 64 bit Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 08/10] Fix const qualifier build errors with recent glibc Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 09/10] Revert "migration/vmstate: remove VMSTATE_BUFFER_POINTER_UNSAFE macro" Philippe Mathieu-Daudé
2025-12-09 20:05 ` [PULL 10/10] Revert "hw/net/virtio-net: make VirtIONet.vlans an array instead of a pointer" Philippe Mathieu-Daudé
2025-12-09 22:42 ` [PULL 00/10] Misc HW patches for 2025-12-09 Richard Henderson

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=20251209200537.84097-6-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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.
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 NNTP newsgroup(s).