diff options
| -rw-r--r-- | vhost_user.c | 16 | ||||
| -rw-r--r-- | virtio.h | 2 | ||||
| -rw-r--r-- | vu_common.c | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/vhost_user.c b/vhost_user.c index 75665ec..f062bad 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; @@ -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 92381cd..13b1e51 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; } |