From nobody Sun Nov 9 14:51:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550625786030805.5366786474915; Tue, 19 Feb 2019 17:23:06 -0800 (PST) Received: from localhost ([127.0.0.1]:57576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwGbH-000636-0n for importer@patchew.org; Tue, 19 Feb 2019 20:23:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwGQg-0005xU-QS for qemu-devel@nongnu.org; Tue, 19 Feb 2019 20:12:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwGMT-0003T7-4D for qemu-devel@nongnu.org; Tue, 19 Feb 2019 20:07:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwGMM-00027i-63; Tue, 19 Feb 2019 20:07:40 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D44317266B; Wed, 20 Feb 2019 01:05:26 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAF561001E7E; Wed, 20 Feb 2019 01:05:15 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Prasad J Pandit , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Date: Wed, 20 Feb 2019 02:02:16 +0100 Message-Id: <20190220010232.18731-10-philmd@redhat.com> In-Reply-To: <20190220010232.18731-1-philmd@redhat.com> References: <20190220010232.18731-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 20 Feb 2019 01:05:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 09/25] vhost-user: Express sizeof with size_t X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , Stefano Stabellini , Samuel Thibault , Li Zhijian , Amit Shah , "Michael S. Tsirkin" , Jason Wang , Cornelia Huck , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Paul Durrant , qemu-ppc@nongnu.org, Gerd Hoffmann , Pavel Dovgalyuk , Zhang Chen , Anthony Perard , xen-devel@lists.xenproject.org, Stefan Berger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" VHOST_USER_HDR_SIZE uses offsetof(), thus is an expression of type size_t. Update the format string accordingly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/vhost-user.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 564a31d12c..2eb7143d3d 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -215,11 +215,12 @@ static int vhost_user_read(struct vhost_dev *dev, Vho= stUserMsg *msg) struct vhost_user *u =3D dev->opaque; CharBackend *chr =3D u->user->chr; uint8_t *p =3D (uint8_t *) msg; - int r, size =3D VHOST_USER_HDR_SIZE; + int r; + size_t size =3D VHOST_USER_HDR_SIZE; =20 r =3D qemu_chr_fe_read_all(chr, p, size); if (r !=3D size) { - error_report("Failed to read msg header. Read %d instead of %d." + error_report("Failed to read msg header. Read %d instead of %zu." " Original request %d.", r, size, msg->hdr.request); goto fail; } @@ -235,7 +236,7 @@ static int vhost_user_read(struct vhost_dev *dev, Vhost= UserMsg *msg) /* validate message size is sane */ if (msg->hdr.size > VHOST_USER_PAYLOAD_SIZE) { error_report("Failed to read msg header." - " Size %d exceeds the maximum %zu.", msg->hdr.size, + " Size %u exceeds the maximum %zu.", msg->hdr.size, VHOST_USER_PAYLOAD_SIZE); goto fail; } @@ -246,7 +247,7 @@ static int vhost_user_read(struct vhost_dev *dev, Vhost= UserMsg *msg) r =3D qemu_chr_fe_read_all(chr, p, size); if (r !=3D size) { error_report("Failed to read msg payload." - " Read %d instead of %d.", r, msg->hdr.size); + " Read %d instead of %u.", r, msg->hdr.size); goto fail; } } @@ -300,7 +301,8 @@ static int vhost_user_write(struct vhost_dev *dev, Vhos= tUserMsg *msg, { struct vhost_user *u =3D dev->opaque; CharBackend *chr =3D u->user->chr; - int ret, size =3D VHOST_USER_HDR_SIZE + msg->hdr.size; + int ret; + size_t size =3D VHOST_USER_HDR_SIZE + msg->hdr.size; =20 /* * For non-vring specific requests, like VHOST_USER_SET_MEM_TABLE, @@ -320,7 +322,7 @@ static int vhost_user_write(struct vhost_dev *dev, Vhos= tUserMsg *msg, ret =3D qemu_chr_fe_write_all(chr, (const uint8_t *) msg, size); if (ret !=3D size) { error_report("Failed to write msg." - " Wrote %d instead of %d.", ret, size); + " Wrote %d instead of %zu.", ret, size); return -1; } =20 --=20 2.20.1