From 791b47541b9fbb05b4bd25994a10750c37efb8eb Mon Sep 17 00:00:00 2001 From: Radu Popescu Date: Wed, 30 Mar 2016 23:35:22 +0200 Subject: [PATCH] Fixing compilation on OS X 10.11.4 and Xcode 7.3 OS X 10.11.4 (15E65) Xcode Version 7.3 (7D175) Apple LLVM version 7.3.0 (clang-703.0.29) --- src/vmm/io/vhpet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vmm/io/vhpet.c b/src/vmm/io/vhpet.c index 1d81861..3e13bda 100644 --- a/src/vmm/io/vhpet.c +++ b/src/vmm/io/vhpet.c @@ -221,7 +221,7 @@ vhpet_timer_interrupt(struct vhpet *vhpet, int n) lapic_intr_msi(vhpet->vm, vhpet->timer[n].msireg >> 32, vhpet->timer[n].msireg & 0xffffffff); return; - } + } pin = vhpet_timer_ioapic_pin(vhpet, n); if (pin == 0) { @@ -291,7 +291,7 @@ vhpet_handler(void *a) callout_deactivate(callout); if (!vhpet_counter_enabled(vhpet)) - xhyve_abort("vhpet(%p) callout with counter disabled\n", vhpet); + xhyve_abort("vhpet(%p) callout with counter disabled\n", (void*)vhpet); counter = vhpet_counter(vhpet, &now); vhpet_start_timer(vhpet, n, counter, now); @@ -483,7 +483,7 @@ vhpet_mmio_write(void *vm, UNUSED int vcpuid, uint64_t gpa, uint64_t val, int si if ((offset & 0x4) != 0) { mask <<= 32; data <<= 32; - } + } break; default: VM_CTR2(vhpet->vm, "hpet invalid mmio write: " @@ -638,7 +638,7 @@ vhpet_mmio_read(void *vm, UNUSED int vcpuid, uint64_t gpa, uint64_t *rval, int s if (offset == HPET_CAPABILITIES || offset == HPET_CAPABILITIES + 4) { data = vhpet_capabilities(); - goto done; + goto done; } if (offset == HPET_CONFIG || offset == HPET_CONFIG + 4) {