| Message ID | 20210505151313.203258-2-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] meson: fix meson 0.58 warning with libvhost-user subproject | expand |
On Wed, May 05, 2021 at 07:13:13PM +0400, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > ../subprojects/libvhost-user/libvhost-user.c:1070:12: error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__u64’ {aka ‘long long unsigned int’} [-Werror=format=] > 1070 | DPRINT(" desc_user_addr: 0x%016" PRIx64 "\n", vra->desc_user_addr); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ > | | > | __u64 {aka long long unsigned int} > > Rather than using %llx, which may fail if __u64 is declared differently > elsewhere, let's just cast the values. Feel free to propose a better solution! > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > subprojects/libvhost-user/libvhost-user.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Looks good to me: Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On 05/05/21 17:38, Stefan Hajnoczi wrote: > On Wed, May 05, 2021 at 07:13:13PM +0400, marcandre.lureau@redhat.com wrote: >> From: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> ../subprojects/libvhost-user/libvhost-user.c:1070:12: error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__u64’ {aka ‘long long unsigned int’} [-Werror=format=] >> 1070 | DPRINT(" desc_user_addr: 0x%016" PRIx64 "\n", vra->desc_user_addr); >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ >> | | >> | __u64 {aka long long unsigned int} >> >> Rather than using %llx, which may fail if __u64 is declared differently >> elsewhere, let's just cast the values. Feel free to propose a better solution! >> >> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> --- >> subprojects/libvhost-user/libvhost-user.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) > > Looks good to me: > > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > Queued both, thanks. Paolo
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index 2971ba0112..bf09693255 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -1067,10 +1067,10 @@ vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg) DPRINT("vhost_vring_addr:\n"); DPRINT(" index: %d\n", vra->index); DPRINT(" flags: %d\n", vra->flags); - DPRINT(" desc_user_addr: 0x%016" PRIx64 "\n", vra->desc_user_addr); - DPRINT(" used_user_addr: 0x%016" PRIx64 "\n", vra->used_user_addr); - DPRINT(" avail_user_addr: 0x%016" PRIx64 "\n", vra->avail_user_addr); - DPRINT(" log_guest_addr: 0x%016" PRIx64 "\n", vra->log_guest_addr); + DPRINT(" desc_user_addr: 0x%016" PRIx64 "\n", (uint64_t)vra->desc_user_addr); + DPRINT(" used_user_addr: 0x%016" PRIx64 "\n", (uint64_t)vra->used_user_addr); + DPRINT(" avail_user_addr: 0x%016" PRIx64 "\n", (uint64_t)vra->avail_user_addr); + DPRINT(" log_guest_addr: 0x%016" PRIx64 "\n", (uint64_t)vra->log_guest_addr); vq->vra = *vra; vq->vring.flags = vra->flags;