trivial: Fix compiler warnings

Signed-off-by: Damon Lee <[email protected]>
seL4 · May 2, 2023 · 095941c · 095941c
1 parent ee86c5f
commit 095941c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/libsel4vm/src/arch/x86/debug.c b/libsel4vm/src/arch/x86/debug.c
@@ -33,7 +33,7 @@ void vm_print_guest_context(vm_vcpu_t *vcpu)
 
     printf("================== GUEST OS CONTEXT =================\n");
 
-    printf("exit info : reason 0x%lx    qualification 0x%lx   instruction len 0x%lx interrupt info 0x%lx interrupt error 0x%x\n",
+    printf("exit info : reason 0x%lx    qualification 0x%lx   instruction len 0x%lx interrupt info 0x%lx interrupt error 0x%lx\n",
            vm_guest_exit_get_reason(vcpu->vcpu_arch.guest_state),
            vm_guest_exit_get_qualification(vcpu->vcpu_arch.guest_state),
            vm_guest_exit_get_int_len(vcpu->vcpu_arch.guest_state), data_exit_info, data_exit_error);

diff --git a/libsel4vm/src/arch/x86/processor/lapic.c b/libsel4vm/src/arch/x86/processor/lapic.c
@@ -813,7 +813,7 @@ void vm_apic_mmio_write(vm_vcpu_t *vcpu, void *cookie, uint32_t offset,
     /* too common printing */
     if (offset != APIC_EOI)
         apic_debug(6, "lapic mmio write at %s: offset 0x%x with length 0x%x, and value is "
-                   "0x%x\n", __func__, offset, len, data);
+                   "0x%lx\n", __func__, offset, len, data);
 
     apic_reg_write(vcpu, offset & 0xff0, data);
 }
@@ -862,7 +862,7 @@ void vm_apic_mmio_read(vm_vcpu_t *vcpu, void *cookie, uint32_t offset,
 
     apic_reg_read(apic, offset, len, data);
 
-    apic_debug(6, "lapic mmio read on vcpu %d, reg %08x = %08x\n", vcpu->vcpu_id, offset, *data);
+    apic_debug(6, "lapic mmio read on vcpu %d, reg %08x = %lx\n", vcpu->vcpu_id, offset, *data);
 
     return;
 }

diff --git a/libsel4vm/src/arch/x86/vmcall.c b/libsel4vm/src/arch/x86/vmcall.c
@@ -56,7 +56,7 @@ int vm_vmcall_handler(vm_vcpu_t *vcpu)
     }
     h = get_handle(vcpu->vm, (int) token);
     if (h == NULL) {
-        ZF_LOGE("Failed to find handler for token:%x\n", token);
+        ZF_LOGE("Failed to find handler for token:%lx\n", token);
         vm_guest_exit_next_instruction(vcpu->vcpu_arch.guest_state, vcpu->vcpu.cptr);
         return VM_EXIT_HANDLED;
     }

diff --git a/libsel4vmmplatsupport/src/arch/x86/drivers/vmm_pci_helper.c b/libsel4vmmplatsupport/src/arch/x86/drivers/vmm_pci_helper.c
@@ -42,7 +42,7 @@ int vmm_pci_helper_map_bars(vm_t *vm, libpci_device_iocfg_t *cfg, vmm_pci_bar_t
             }
             /* Make sure that the address is naturally aligned to its size */
             if (addr % size) {
-                ZF_LOGE("Guest PCI bar address %p is not aligned to size %zu", addr, size);
+                ZF_LOGE("Guest PCI bar address 0x%lx is not aligned to size %zu", addr, size);
                 return -1;
             }
             int err = map_ut_alloc_reservation_with_base_paddr(vm, (uintptr_t)cfg->base_addr[i], reservation);