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=ACt9h/Wg; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 025B85A026D for ; Fri, 27 Mar 2026 05:34:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1774586072; bh=jKgcS5HpIMrYSiUB8l9YyiyuKELJN+y8jvm6v36pa7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ACt9h/WgJqlj4j5XCXKyoyTQjErpAfQc1BVJAXs7QiLg1ANMPCPBAZBcTqXznvvZP AGytXX/jJSHJAl+kkAa3iCqG5BBWvDvlv/HJOOdilV7q71sUrp/cUsG7/hOM/vtLhs DGMkEiRv6GezUOwoiJEcNJ7lGajOftjE1bHabwSOPr1aaTA0unrlb4SUXGun2z1rOy Fw2G2IxRqDTSutOpNTzck7p21mvd0w6mg8mL+TL5tK6Xloqgnq8q9uMPP7WlDjyBpK XZIHP3M94L4QylzTgfIG88h6mtvKr3VF9ZZ6iGMgJHwy72l3KslnlhtCEFfonRAZ4g 6Mlbss3OrXVYA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4fhnqD4n5Qz4wSs; Fri, 27 Mar 2026 15:34:32 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 03/18] vhost_user: Fix assorted minor cppcheck warnings Date: Fri, 27 Mar 2026 15:34:15 +1100 Message-ID: <20260327043430.1785787-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260327043430.1785787-1-david@gibson.dropbear.id.au> References: <20260327043430.1785787-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: RMJUIS2XOEEXLUMK7LAWG4KX67PGSRZO X-Message-ID-Hash: RMJUIS2XOEEXLUMK7LAWG4KX67PGSRZO 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: David Gibson 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: This fixes a batch of minor incorrect format specifier and "could be const" warnings in the vhost_user code. For some very strange reason, cppcheck doesn't catch these errors right now, but does after code rearrangements we're making for the dynamic forwarding update stuff. Signed-off-by: David Gibson --- vhost_user.c | 16 +++++++++------- virtio.h | 2 +- vu_common.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/vhost_user.c b/vhost_user.c index 75665ec6..f062badd 100644 --- a/vhost_user.c +++ b/vhost_user.c @@ -440,11 +440,13 @@ static bool vu_set_mem_table_exec(struct vu_dev *vdev, debug("vhost-user nregions: %u", memory->nregions); for (i = 0; i < vdev->memory.nregions; i++) { - struct vhost_user_memory_region *msg_region = &memory->regions[i]; struct vu_dev_region *dev_region = &vdev->memory.regions[i]; + const struct vhost_user_memory_region *msg_region; const void *mmap_addr; - debug("vhost-user region %d", i); + msg_region = &memory->regions[i]; + + debug("vhost-user region %u", i); debug(" guest_phys_addr: 0x%016"PRIx64, msg_region->guest_phys_addr); debug(" memory_size: 0x%016"PRIx64, @@ -479,7 +481,7 @@ static bool vu_set_mem_table_exec(struct vu_dev *vdev, for (i = 0; i < VHOST_USER_MAX_VQS; i++) { if (vdev->vq[i].vring.desc) { if (map_ring(vdev, &vdev->vq[i])) - die("remapping queue %d during setmemtable", i); + die("remapping queue %u during setmemtable", i); } } @@ -763,8 +765,8 @@ static void vu_set_watch(const struct vu_dev *vdev, int idx) */ static void vu_check_queue_msg_file(struct vhost_user_msg *vmsg) { + unsigned idx = vmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK; bool nofd = vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK; - int idx = vmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK; if (idx >= VHOST_USER_MAX_VQS) die("Invalid vhost-user queue index: %u", idx); @@ -1010,11 +1012,11 @@ static bool vu_set_device_state_fd_exec(struct vu_dev *vdev, die("Invalid device_state_fd message"); if (phase != VHOST_USER_TRANSFER_STATE_PHASE_STOPPED) - die("Invalid device_state_fd phase: %d", phase); + die("Invalid device_state_fd phase: %u", phase); if (direction != VHOST_USER_TRANSFER_STATE_DIRECTION_SAVE && direction != VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD) - die("Invalid device_state_fd direction: %d", direction); + die("Invalid device_state_fd direction: %u", direction); migrate_request(vdev->context, vmsg->fds[0], direction == VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD); @@ -1047,7 +1049,7 @@ static bool vu_check_device_state_exec(struct vu_dev *vdev, */ void vu_init(struct ctx *c) { - int i; + unsigned i; c->vdev = &vdev_storage; c->vdev->context = c; diff --git a/virtio.h b/virtio.h index c7e447d5..8f2ae068 100644 --- a/virtio.h +++ b/virtio.h @@ -90,7 +90,7 @@ struct vu_dev_region { uint64_t mmap_addr; }; -#define VHOST_USER_MAX_VQS 2 +#define VHOST_USER_MAX_VQS 2U /* * Set a reasonable maximum number of ram slots, which will be supported by diff --git a/vu_common.c b/vu_common.c index 92381cd3..13b1e510 100644 --- a/vu_common.c +++ b/vu_common.c @@ -256,7 +256,7 @@ int vu_send_single(const struct ctx *c, const void *buf, size_t size) ARRAY_SIZE(in_sg), &in_total, size, &total); if (elem_cnt == 0 || total < size) { debug("vu_send_single: no space to send the data " - "elem_cnt %d size %zd", elem_cnt, total); + "elem_cnt %d size %zu", elem_cnt, total); goto err; } -- 2.53.0