trivial: Cleanup compiler warnings
diff --git a/libsel4vm/src/arch/x86/i8259/i8259.c b/libsel4vm/src/arch/x86/i8259/i8259.c
index b9e093d..b8c38d1 100644
--- a/libsel4vm/src/arch/x86/i8259/i8259.c
+++ b/libsel4vm/src/arch/x86/i8259/i8259.c
@@ -285,7 +285,7 @@
 
     for (irq = 0; irq < PIC_NUM_PINS / 2; irq++) {
         if (edge_irr & (1 << irq)) {
-            pic_clear_isr(vm->vcpus[BOOT_VCPU], s, irq);
+            pic_clear_isr(vm, s, irq);
         }
     }
 }
@@ -308,7 +308,7 @@
                 printf("PIC: level sensitive irq not supported\n");
             }
             /* Reset the machine state and pending IRQS. */
-            pic_reset(vcpu, s);
+            pic_reset(vcpu->vm, s);
 
         } else if (val & 0x08) {
             /* OCW 3 */
@@ -441,7 +441,7 @@
 
     /* Poll for the highest priority IRQ. */
     if (s->poll) {
-        ret = pic_poll_read(vcpu, s, addr);
+        ret = pic_poll_read(vcpu->vm, s, addr);
         s->poll = 0;
 
     } else {
diff --git a/libsel4vm/src/arch/x86/ioports.c b/libsel4vm/src/arch/x86/ioports.c
index d44a261..52f4f23 100644
--- a/libsel4vm/src/arch/x86/ioports.c
+++ b/libsel4vm/src/arch/x86/ioports.c
@@ -28,7 +28,7 @@
 
 static int io_port_compare_by_range(const void *pkey, const void *pelem)
 {
-    unsigned int key = (unsigned int)pkey;
+    unsigned int key = (unsigned int)(uintptr_t)pkey;
     const vm_ioport_entry_t *entry = (const vm_ioport_entry_t *)pelem;
     const vm_ioport_range_t *elem = &entry->range;
     if (key < elem->start) {
diff --git a/libsel4vmmplatsupport/src/ioports.c b/libsel4vmmplatsupport/src/ioports.c
index 9bf80d6..4bb3d6c 100644
--- a/libsel4vmmplatsupport/src/ioports.c
+++ b/libsel4vmmplatsupport/src/ioports.c
@@ -18,7 +18,7 @@
 
 static int io_port_compare_by_range(const void *pkey, const void *pelem)
 {
-    unsigned int key = (unsigned int)pkey;
+    unsigned int key = (unsigned int)(uintptr_t)pkey;
     const ioport_entry_t *entry = (const ioport_entry_t *)(*(const ioport_entry_t **)pelem);
     const ioport_range_t *elem = &entry->range;
     if (key < elem->start) {