diff options
| -rw-r--r-- | lib/dma.c | 11 | ||||
| -rw-r--r-- | lib/migration.c | 8 | ||||
| -rw-r--r-- | lib/muser_ctx.c | 29 | ||||
| -rw-r--r-- | lib/muser_pci.c | 8 | ||||
| -rw-r--r-- | samples/server.c | 4 |
5 files changed, 31 insertions, 29 deletions
@@ -102,8 +102,9 @@ _dma_controller_do_remove_region(dma_controller_t *dma, err = dma_unmap_region(region, region->virt_addr, region->size); if (err != 0) { - lm_log(dma->lm_ctx, LM_DBG, "failed to unmap fd=%d vaddr=%#lx-%#lx\n", - region->fd, region->virt_addr, region->size); + lm_log(dma->lm_ctx, LM_DBG, "failed to unmap fd=%d vaddr=%p-%p\n", + region->fd, region->virt_addr, + region->virt_addr + region->size - 1); } if (region->fd != -1) { if (close(region->fd) == -1) { @@ -184,7 +185,7 @@ dma_controller_remove_regions(dma_controller_t *dma) for (i = 0; i < dma->nregions; i++) { dma_memory_region_t *region = &dma->regions[i]; - lm_log(dma->lm_ctx, LM_INF, "unmap vaddr=%#lx IOVA=%#lx", + lm_log(dma->lm_ctx, LM_INF, "unmap vaddr=%p IOVA=%lx", region->virt_addr, region->dma_addr); _dma_controller_do_remove_region(dma, region); @@ -223,8 +224,8 @@ dma_controller_add_region(dma_controller_t *dma, if (region->dma_addr == dma_addr && region->size == size) { if (offset != region->offset) { lm_log(dma->lm_ctx, LM_ERR, - "bad offset for new DMA region %#lx+%#lx, want=%d, existing=%d\n", - dma_addr, size, offset, region->offset); + "bad offset for new DMA region %#lx-%#lx, want=%ld, existing=%ld\n", + dma_addr, dma_addr + size, offset, region->offset); goto err; } if (!fds_are_same_file(region->fd, fd)) { diff --git a/lib/migration.c b/lib/migration.c index f513938..2e95322 100644 --- a/lib/migration.c +++ b/lib/migration.c @@ -382,28 +382,28 @@ handle_region_access_registers(lm_ctx_t *lm_ctx, void *pvt, switch (pos) { case offsetof(struct vfio_device_migration_info, device_state): if (count != sizeof(migr->info.device_state)) { - lm_log(lm_ctx, LM_ERR, "bad device_state access size %d", count); + lm_log(lm_ctx, LM_ERR, "bad device_state access size %ld", count); return -EINVAL; } ret = handle_device_state(lm_ctx, pvt, migr, (__u32*)buf, is_write); break; case offsetof(struct vfio_device_migration_info, pending_bytes): if (count != sizeof(migr->info.pending_bytes)) { - lm_log(lm_ctx, LM_ERR, "bad pending_bytes access size %d", count); + lm_log(lm_ctx, LM_ERR, "bad pending_bytes access size %ld", count); return -EINVAL; } ret = handle_pending_bytes(pvt, migr, (__u64*)buf, is_write); break; case offsetof(struct vfio_device_migration_info, data_offset): if (count != sizeof(migr->info.data_offset)) { - lm_log(lm_ctx, LM_ERR, "bad data_offset access size %d", count); + lm_log(lm_ctx, LM_ERR, "bad data_offset access size %ld", count); return -EINVAL; } ret = handle_data_offset(lm_ctx, pvt, migr, (__u64*)buf, is_write); break; case offsetof(struct vfio_device_migration_info, data_size): if (count != sizeof(migr->info.data_size)) { - lm_log(lm_ctx, LM_ERR, "bad data_size access size %d", count); + lm_log(lm_ctx, LM_ERR, "bad data_size access size %ld", count); return -EINVAL; } ret = handle_data_size(lm_ctx, pvt, migr, (__u64*)buf, is_write); diff --git a/lib/muser_ctx.c b/lib/muser_ctx.c index bf5dbb5..76a2b6b 100644 --- a/lib/muser_ctx.c +++ b/lib/muser_ctx.c @@ -228,7 +228,7 @@ irqs_trigger(lm_ctx_t *lm_ctx, struct vfio_irq_set *irq_set, void *data) return irqs_disable(lm_ctx, irq_set->index); } - lm_log(lm_ctx, LM_DBG, "setting IRQ %s flags=%#lx", + lm_log(lm_ctx, LM_DBG, "setting IRQ %s flags=%#x", vfio_irq_idx_to_str(irq_set->index), irq_set->flags); switch (irq_set->flags & VFIO_IRQ_SET_DATA_TYPE_MASK) { @@ -296,7 +296,7 @@ dev_set_irqs_validate(lm_ctx_t *lm_ctx, struct vfio_irq_set *irq_set) // count == 0 is only valid with ACTION_TRIGGER and DATA_NONE. if ((irq_set->count == 0) && ((a_type != VFIO_IRQ_SET_ACTION_TRIGGER) || (d_type != VFIO_IRQ_SET_DATA_NONE))) { - lm_log(lm_ctx, LM_DBG, "bad IRQ count %d\n"); + lm_log(lm_ctx, LM_DBG, "bad IRQ count %d\n", irq_set->count); return -EINVAL; } // If IRQs are set, ensure index matches what's enabled for the device. @@ -420,8 +420,9 @@ dev_get_caps(lm_ctx_t *lm_ctx, lm_reg_info_t *lm_reg, bool is_migr_reg, for (i = 0; i < nr_mmap_areas; i++) { sparse->areas[i].offset = mmap_areas->areas[i].start; sparse->areas[i].size = mmap_areas->areas[i].size; - lm_log(lm_ctx, LM_DBG, "%s: area %d offset %#lx size %llu", __func__, - i, sparse->areas[i].offset, sparse->areas[i].size); + lm_log(lm_ctx, LM_DBG, "%s: area %d %#llx-%#llx", __func__, + i, sparse->areas[i].offset, + sparse->areas[i].offset + sparse->areas[i].size); } } @@ -516,8 +517,8 @@ dev_get_reginfo(lm_ctx_t *lm_ctx, uint32_t index, dev_get_caps(lm_ctx, lm_reg, is_migr_reg(lm_ctx, index), *vfio_reg); } - lm_log(lm_ctx, LM_DBG, "region_info[%d] offset %#lx flags %#x size %llu " - "argsz %llu", + lm_log(lm_ctx, LM_DBG, "region_info[%d] offset %#llx flags %#x size %llu " + "argsz %u", (*vfio_reg)->index, (*vfio_reg)->offset, (*vfio_reg)->flags, (*vfio_reg)->size, (*vfio_reg)->argsz); @@ -563,8 +564,8 @@ handle_pci_config_space_access(lm_ctx_t *lm_ctx, char *buf, size_t count, if (is_write) { ret = cap_maybe_access(lm_ctx, lm_ctx->caps, buf, count, pos); if (ret < 0) { - lm_log(lm_ctx, LM_ERR, "bad access to capabilities %u@%#x\n", count, - pos); + lm_log(lm_ctx, LM_ERR, "bad access to capabilities %#lx-%#lx\n", + pos, pos + count); return ret; } } else { @@ -601,7 +602,7 @@ do_access(lm_ctx_t *lm_ctx, char *buf, uint8_t count, uint64_t pos, bool is_writ if (is_migr_reg(lm_ctx, idx)) { if (offset + count > lm_ctx->reg_info[idx].size) { - lm_log(lm_ctx, LM_ERR, "read %#x-%#x past end of migration region (%#lx)", + lm_log(lm_ctx, LM_ERR, "read %#lx-%#lx past end of migration region (%#x)", offset, offset + count - 1, lm_ctx->reg_info[idx].size); return -EINVAL; @@ -675,7 +676,7 @@ lm_access(lm_ctx_t *lm_ctx, char *buf, uint32_t count, uint64_t *ppos, return -EFAULT; } if (ret != (int)size) { - lm_log(lm_ctx, LM_DBG, "bad read %d != %d", ret, size); + lm_log(lm_ctx, LM_DBG, "bad read %d != %ld", ret, size); } count -= size; done += size; @@ -937,7 +938,7 @@ validate_region_access(lm_ctx_t *lm_ctx, uint32_t size, uint16_t cmd, if (cmd == VFIO_USER_REGION_WRITE && size - sizeof *region_access != region_access->count) { - lm_log(lm_ctx, LM_ERR, "bad region access, expected %d, actual %d", + lm_log(lm_ctx, LM_ERR, "bad region access, expected %lu, actual %d", size - sizeof *region_access, region_access->count); return -EINVAL; } @@ -983,7 +984,7 @@ handle_region_access(lm_ctx_t *lm_ctx, uint32_t size, uint16_t cmd, ret = muser_access(lm_ctx, cmd == VFIO_USER_REGION_WRITE, buf, count, &offset); if (ret != (int)region_access->count) { - lm_log(lm_ctx, LM_ERR, "failed to %s %#lx-%#lx: %d", + lm_log(lm_ctx, LM_ERR, "failed to %s %#x-%#lx: %d", cmd == VFIO_USER_REGION_WRITE ? "write" : "read", region_access->count, region_access->offset + region_access->count - 1, ret); @@ -1056,7 +1057,7 @@ handle_dirty_pages(lm_ctx_t *lm_ctx, uint32_t size, assert(dirty_bitmap != NULL); if (size < sizeof *dirty_bitmap || size != dirty_bitmap->argsz) { - lm_log(lm_ctx, LM_ERR, "invalid header size %lu", size); + lm_log(lm_ctx, LM_ERR, "invalid header size %u", size); return -EINVAL; } @@ -1091,7 +1092,7 @@ validate_header(lm_ctx_t *lm_ctx, struct vfio_user_header *hdr, size_t size) assert(hdr != NULL); if (size < sizeof hdr) { - lm_log(lm_ctx, LM_ERR, "short header read %u", size); + lm_log(lm_ctx, LM_ERR, "short header read %ld", size); return -EINVAL; } diff --git a/lib/muser_pci.c b/lib/muser_pci.c index 2846301..8abf9c6 100644 --- a/lib/muser_pci.c +++ b/lib/muser_pci.c @@ -89,7 +89,7 @@ handle_command_write(lm_ctx_t *ctx, lm_pci_config_space_t *pci, assert(ctx != NULL); if (count != 2) { - lm_log(ctx, LM_ERR, "bad write command size %d\n", count); + lm_log(ctx, LM_ERR, "bad write command size %lu\n", count); return -EINVAL; } @@ -199,7 +199,7 @@ handle_erom_write(lm_ctx_t *ctx, lm_pci_config_space_t *pci, assert(pci != NULL); if (count != 0x4) { - lm_log(ctx, LM_ERR, "bad EROM count %d\n", count); + lm_log(ctx, LM_ERR, "bad EROM count %lu\n", count); return -EINVAL; } v = *(uint32_t*)buf; @@ -261,8 +261,8 @@ muser_pci_hdr_write(lm_ctx_t *lm_ctx, uint16_t offset, ret = handle_erom_write(lm_ctx, pci, buf, count); break; default: - lm_log(lm_ctx, LM_INF, "PCI config write %x@%x not handled\n", - count, offset); + lm_log(lm_ctx, LM_INF, "PCI config write %#x-%#lx not handled\n", + offset, offset + count); ret = -EINVAL; } diff --git a/samples/server.c b/samples/server.c index 70733cd..8502331 100644 --- a/samples/server.c +++ b/samples/server.c @@ -80,7 +80,7 @@ arm_timer(struct server_data *server_data, time_t t) { struct itimerval new = {.it_value.tv_sec = t - time(NULL) }; lm_log(server_data->lm_ctx, LM_DBG, - "arming timer to trigger in %d seconds", new.it_value.tv_sec); + "arming timer to trigger in %ld seconds", new.it_value.tv_sec); if (setitimer(ITIMER_REAL, &new, NULL) != 0) { lm_log(server_data->lm_ctx, LM_ERR, "failed to arm timer: %m"); return -errno; @@ -303,7 +303,7 @@ migration_read_data(void *pvt, void *buf, __u64 size, __u64 offset) if (server_data->migration.data_size < size) { lm_log(server_data->lm_ctx, LM_ERR, - "invalid migration data read %#lx-%#lx", + "invalid migration data read %#llx-%#llx", offset, offset + size - 1); return -EINVAL; } |