Message ID | 5FA28106.6000901@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | contrib/libvhost-user: Fix bad printf format specifiers | expand |
Kindly ping... On 2020/11/4 18:23, AlexChen wrote: > We should use printf format specifier "%u" instead of "%d" for > argument of type "unsigned int". > > Reported-by: Euler Robot <euler.robot@huawei.com> > Signed-off-by: Alex Chen <alex.chen@huawei.com> > --- > contrib/libvhost-user/libvhost-user.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c > index bfec8a881a..5c73ffdd6b 100644 > --- a/contrib/libvhost-user/libvhost-user.c > +++ b/contrib/libvhost-user/libvhost-user.c > @@ -701,7 +701,7 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { > return false; > } > > - DPRINT("Adding region: %d\n", dev->nregions); > + DPRINT("Adding region: %u\n", dev->nregions); > DPRINT(" guest_phys_addr: 0x%016"PRIx64"\n", > msg_region->guest_phys_addr); > DPRINT(" memory_size: 0x%016"PRIx64"\n", > @@ -848,7 +848,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg) > VhostUserMemory m = vmsg->payload.memory, *memory = &m; > dev->nregions = memory->nregions; > > - DPRINT("Nregions: %d\n", memory->nregions); > + DPRINT("Nregions: %u\n", memory->nregions); > for (i = 0; i < dev->nregions; i++) { > void *mmap_addr; > VhostUserMemoryRegion *msg_region = &memory->regions[i]; > @@ -938,7 +938,7 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg) > return vu_set_mem_table_exec_postcopy(dev, vmsg); > } > > - DPRINT("Nregions: %d\n", memory->nregions); > + DPRINT("Nregions: %u\n", memory->nregions); > for (i = 0; i < dev->nregions; i++) { > void *mmap_addr; > VhostUserMemoryRegion *msg_region = &memory->regions[i]; > @@ -1049,8 +1049,8 @@ vu_set_vring_num_exec(VuDev *dev, VhostUserMsg *vmsg) > unsigned int index = vmsg->payload.state.index; > unsigned int num = vmsg->payload.state.num; > > - DPRINT("State.index: %d\n", index); > - DPRINT("State.num: %d\n", num); > + DPRINT("State.index: %u\n", index); > + DPRINT("State.num: %u\n", num); > dev->vq[index].vring.num = num; > > return false; > @@ -1105,8 +1105,8 @@ vu_set_vring_base_exec(VuDev *dev, VhostUserMsg *vmsg) > unsigned int index = vmsg->payload.state.index; > unsigned int num = vmsg->payload.state.num; > > - DPRINT("State.index: %d\n", index); > - DPRINT("State.num: %d\n", num); > + DPRINT("State.index: %u\n", index); > + DPRINT("State.num: %u\n", num); > dev->vq[index].shadow_avail_idx = dev->vq[index].last_avail_idx = num; > > return false; > @@ -1117,7 +1117,7 @@ vu_get_vring_base_exec(VuDev *dev, VhostUserMsg *vmsg) > { > unsigned int index = vmsg->payload.state.index; > > - DPRINT("State.index: %d\n", index); > + DPRINT("State.index: %u\n", index); > vmsg->payload.state.num = dev->vq[index].last_avail_idx; > vmsg->size = sizeof(vmsg->payload.state); > > @@ -1478,8 +1478,8 @@ vu_set_vring_enable_exec(VuDev *dev, VhostUserMsg *vmsg) > unsigned int index = vmsg->payload.state.index; > unsigned int enable = vmsg->payload.state.num; > > - DPRINT("State.index: %d\n", index); > - DPRINT("State.enable: %d\n", enable); > + DPRINT("State.index: %u\n", index); > + DPRINT("State.enable: %u\n", enable); > > if (index >= dev->max_queues) { > vu_panic(dev, "Invalid vring_enable index: %u", index); > @@ -1728,7 +1728,7 @@ vu_handle_vring_kick(VuDev *dev, VhostUserMsg *vmsg) > return false; > } > > - DPRINT("Got kick message: handler:%p idx:%d\n", > + DPRINT("Got kick message: handler:%p idx:%u\n", > dev->vq[index].handler, index); > > if (!dev->vq[index].started) { > @@ -1772,7 +1772,7 @@ vu_process_message(VuDev *dev, VhostUserMsg *vmsg) > DPRINT("Request: %s (%d)\n", vu_request_to_string(vmsg->request), > vmsg->request); > DPRINT("Flags: 0x%x\n", vmsg->flags); > - DPRINT("Size: %d\n", vmsg->size); > + DPRINT("Size: %u\n", vmsg->size); > > if (vmsg->fd_num) { > int i; >
It's in the latest pull weren't you Cc'd? On Mon, Nov 16, 2020 at 10:14:12AM +0800, Alex Chen wrote: > Kindly ping... > > On 2020/11/4 18:23, AlexChen wrote: > > We should use printf format specifier "%u" instead of "%d" for > > argument of type "unsigned int". > > > > Reported-by: Euler Robot <euler.robot@huawei.com> > > Signed-off-by: Alex Chen <alex.chen@huawei.com> > > --- > > contrib/libvhost-user/libvhost-user.c | 24 ++++++++++++------------ > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c > > index bfec8a881a..5c73ffdd6b 100644 > > --- a/contrib/libvhost-user/libvhost-user.c > > +++ b/contrib/libvhost-user/libvhost-user.c > > @@ -701,7 +701,7 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { > > return false; > > } > > > > - DPRINT("Adding region: %d\n", dev->nregions); > > + DPRINT("Adding region: %u\n", dev->nregions); > > DPRINT(" guest_phys_addr: 0x%016"PRIx64"\n", > > msg_region->guest_phys_addr); > > DPRINT(" memory_size: 0x%016"PRIx64"\n", > > @@ -848,7 +848,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg) > > VhostUserMemory m = vmsg->payload.memory, *memory = &m; > > dev->nregions = memory->nregions; > > > > - DPRINT("Nregions: %d\n", memory->nregions); > > + DPRINT("Nregions: %u\n", memory->nregions); > > for (i = 0; i < dev->nregions; i++) { > > void *mmap_addr; > > VhostUserMemoryRegion *msg_region = &memory->regions[i]; > > @@ -938,7 +938,7 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg) > > return vu_set_mem_table_exec_postcopy(dev, vmsg); > > } > > > > - DPRINT("Nregions: %d\n", memory->nregions); > > + DPRINT("Nregions: %u\n", memory->nregions); > > for (i = 0; i < dev->nregions; i++) { > > void *mmap_addr; > > VhostUserMemoryRegion *msg_region = &memory->regions[i]; > > @@ -1049,8 +1049,8 @@ vu_set_vring_num_exec(VuDev *dev, VhostUserMsg *vmsg) > > unsigned int index = vmsg->payload.state.index; > > unsigned int num = vmsg->payload.state.num; > > > > - DPRINT("State.index: %d\n", index); > > - DPRINT("State.num: %d\n", num); > > + DPRINT("State.index: %u\n", index); > > + DPRINT("State.num: %u\n", num); > > dev->vq[index].vring.num = num; > > > > return false; > > @@ -1105,8 +1105,8 @@ vu_set_vring_base_exec(VuDev *dev, VhostUserMsg *vmsg) > > unsigned int index = vmsg->payload.state.index; > > unsigned int num = vmsg->payload.state.num; > > > > - DPRINT("State.index: %d\n", index); > > - DPRINT("State.num: %d\n", num); > > + DPRINT("State.index: %u\n", index); > > + DPRINT("State.num: %u\n", num); > > dev->vq[index].shadow_avail_idx = dev->vq[index].last_avail_idx = num; > > > > return false; > > @@ -1117,7 +1117,7 @@ vu_get_vring_base_exec(VuDev *dev, VhostUserMsg *vmsg) > > { > > unsigned int index = vmsg->payload.state.index; > > > > - DPRINT("State.index: %d\n", index); > > + DPRINT("State.index: %u\n", index); > > vmsg->payload.state.num = dev->vq[index].last_avail_idx; > > vmsg->size = sizeof(vmsg->payload.state); > > > > @@ -1478,8 +1478,8 @@ vu_set_vring_enable_exec(VuDev *dev, VhostUserMsg *vmsg) > > unsigned int index = vmsg->payload.state.index; > > unsigned int enable = vmsg->payload.state.num; > > > > - DPRINT("State.index: %d\n", index); > > - DPRINT("State.enable: %d\n", enable); > > + DPRINT("State.index: %u\n", index); > > + DPRINT("State.enable: %u\n", enable); > > > > if (index >= dev->max_queues) { > > vu_panic(dev, "Invalid vring_enable index: %u", index); > > @@ -1728,7 +1728,7 @@ vu_handle_vring_kick(VuDev *dev, VhostUserMsg *vmsg) > > return false; > > } > > > > - DPRINT("Got kick message: handler:%p idx:%d\n", > > + DPRINT("Got kick message: handler:%p idx:%u\n", > > dev->vq[index].handler, index); > > > > if (!dev->vq[index].started) { > > @@ -1772,7 +1772,7 @@ vu_process_message(VuDev *dev, VhostUserMsg *vmsg) > > DPRINT("Request: %s (%d)\n", vu_request_to_string(vmsg->request), > > vmsg->request); > > DPRINT("Flags: 0x%x\n", vmsg->flags); > > - DPRINT("Size: %d\n", vmsg->size); > > + DPRINT("Size: %u\n", vmsg->size); > > > > if (vmsg->fd_num) { > > int i; > >
On 2020/11/16 17:52, Michael S. Tsirkin wrote: > It's in the latest pull weren't you Cc'd? > This is my fault, I see this patch in the latest pull. thank you!!! Thanks, Alex > On Mon, Nov 16, 2020 at 10:14:12AM +0800, Alex Chen wrote: >> Kindly ping... >> >> On 2020/11/4 18:23, AlexChen wrote: >>> We should use printf format specifier "%u" instead of "%d" for >>> argument of type "unsigned int".
diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c index bfec8a881a..5c73ffdd6b 100644 --- a/contrib/libvhost-user/libvhost-user.c +++ b/contrib/libvhost-user/libvhost-user.c @@ -701,7 +701,7 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { return false; } - DPRINT("Adding region: %d\n", dev->nregions); + DPRINT("Adding region: %u\n", dev->nregions); DPRINT(" guest_phys_addr: 0x%016"PRIx64"\n", msg_region->guest_phys_addr); DPRINT(" memory_size: 0x%016"PRIx64"\n", @@ -848,7 +848,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg) VhostUserMemory m = vmsg->payload.memory, *memory = &m; dev->nregions = memory->nregions; - DPRINT("Nregions: %d\n", memory->nregions); + DPRINT("Nregions: %u\n", memory->nregions); for (i = 0; i < dev->nregions; i++) { void *mmap_addr; VhostUserMemoryRegion *msg_region = &memory->regions[i]; @@ -938,7 +938,7 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg) return vu_set_mem_table_exec_postcopy(dev, vmsg); } - DPRINT("Nregions: %d\n", memory->nregions); + DPRINT("Nregions: %u\n", memory->nregions); for (i = 0; i < dev->nregions; i++) { void *mmap_addr; VhostUserMemoryRegion *msg_region = &memory->regions[i]; @@ -1049,8 +1049,8 @@ vu_set_vring_num_exec(VuDev *dev, VhostUserMsg *vmsg) unsigned int index = vmsg->payload.state.index; unsigned int num = vmsg->payload.state.num; - DPRINT("State.index: %d\n", index); - DPRINT("State.num: %d\n", num); + DPRINT("State.index: %u\n", index); + DPRINT("State.num: %u\n", num); dev->vq[index].vring.num = num; return false; @@ -1105,8 +1105,8 @@ vu_set_vring_base_exec(VuDev *dev, VhostUserMsg *vmsg) unsigned int index = vmsg->payload.state.index; unsigned int num = vmsg->payload.state.num; - DPRINT("State.index: %d\n", index); - DPRINT("State.num: %d\n", num); + DPRINT("State.index: %u\n", index); + DPRINT("State.num: %u\n", num); dev->vq[index].shadow_avail_idx = dev->vq[index].last_avail_idx = num; return false; @@ -1117,7 +1117,7 @@ vu_get_vring_base_exec(VuDev *dev, VhostUserMsg *vmsg) { unsigned int index = vmsg->payload.state.index; - DPRINT("State.index: %d\n", index); + DPRINT("State.index: %u\n", index); vmsg->payload.state.num = dev->vq[index].last_avail_idx; vmsg->size = sizeof(vmsg->payload.state); @@ -1478,8 +1478,8 @@ vu_set_vring_enable_exec(VuDev *dev, VhostUserMsg *vmsg) unsigned int index = vmsg->payload.state.index; unsigned int enable = vmsg->payload.state.num; - DPRINT("State.index: %d\n", index); - DPRINT("State.enable: %d\n", enable); + DPRINT("State.index: %u\n", index); + DPRINT("State.enable: %u\n", enable); if (index >= dev->max_queues) { vu_panic(dev, "Invalid vring_enable index: %u", index); @@ -1728,7 +1728,7 @@ vu_handle_vring_kick(VuDev *dev, VhostUserMsg *vmsg) return false; } - DPRINT("Got kick message: handler:%p idx:%d\n", + DPRINT("Got kick message: handler:%p idx:%u\n", dev->vq[index].handler, index); if (!dev->vq[index].started) { @@ -1772,7 +1772,7 @@ vu_process_message(VuDev *dev, VhostUserMsg *vmsg) DPRINT("Request: %s (%d)\n", vu_request_to_string(vmsg->request), vmsg->request); DPRINT("Flags: 0x%x\n", vmsg->flags); - DPRINT("Size: %d\n", vmsg->size); + DPRINT("Size: %u\n", vmsg->size); if (vmsg->fd_num) { int i;
We should use printf format specifier "%u" instead of "%d" for argument of type "unsigned int". Reported-by: Euler Robot <euler.robot@huawei.com> Signed-off-by: Alex Chen <alex.chen@huawei.com> --- contrib/libvhost-user/libvhost-user.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)