From 8fe7fdb0fbcc8ad257e3b8203d7301a35184b61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Tue, 5 Sep 2023 13:21:14 -0700 Subject: dev: virtio: Fix build error Bug: 298705967 Change-Id: I1295c9ff397186c4b80c4c65b477d5b7d2971642 --- dev/virtio/virtio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev/virtio/virtio.c b/dev/virtio/virtio.c index 46e4c099..3f6e7ef4 100644 --- a/dev/virtio/virtio.c +++ b/dev/virtio/virtio.c @@ -72,10 +72,10 @@ static void dump_mmio_config(const volatile struct virtio_mmio_config *mmio) void virtio_dump_desc(const struct vring_desc *desc) { printf("vring descriptor %p\n", desc); - printf("\taddr 0x%llx\n", desc->addr); + printf("\taddr 0x%" PRIx64 "\n", desc->addr); printf("\tlen 0x%x\n", desc->len); - printf("\tflags 0x%hhx\n", desc->flags); - printf("\tnext 0x%hhx\n", desc->next); + printf("\tflags 0x%" PRIx16 "\n", desc->flags); + printf("\tnext 0x%" PRIx16 "\n", desc->next); } static enum handler_return virtio_mmio_irq(void *arg) @@ -97,7 +97,8 @@ static enum handler_return virtio_mmio_irq(void *arg) continue; struct vring *ring = &dev->ring[r]; - LTRACEF("ring %u: used flags 0x%hhx idx 0x%hhx last_used %u\n", r, ring->used->flags, ring->used->idx, ring->last_used); + LTRACEF("ring %u: used flags 0x%" PRIx16 " idx 0x%" PRIx16 " last_used %u\n", + r, ring->used->flags, ring->used->idx, ring->last_used); uint cur_idx = ring->used->idx; for (uint i = ring->last_used; i != (cur_idx & ring->num_mask); i = (i + 1) & ring->num_mask) { @@ -354,7 +355,7 @@ status_t virtio_alloc_ring(struct virtio_device *dev, uint index, uint16_t len) return ERR_NO_MEMORY; } - LTRACEF("virtio_ring at pa 0x%lx\n", pa); + LTRACEF("virtio_ring at pa 0x%" PRIxPADDR "\n", pa); #else void *vptr = memalign(PAGE_SIZE, size); if (!vptr) -- cgit v1.2.3