path: root/hw
authorAvi Kivity <[email protected]>2011-06-28 12:02:16 (GMT)
committer Avi Kivity <[email protected]>2011-06-28 12:02:16 (GMT)
commitf2604887b74feb9907d7b7b3237561bbde6736c8 (patch) (side-by-side diff)
tree02392b28737bfde92a039ce83606ea8aa31c7518 /hw
parentbcd4f22796ebda2934a980060ea704ebedb46173 (diff)
parent3c688828bcb3afa2744e1f1729a40eef4a575b56 (diff)
Merge commit '3c688828bcb3afa2744e1f1729a40eef4a575b56' into upstream-merge
* commit '3c688828bcb3afa2744e1f1729a40eef4a575b56': m68k: use caller supplied CPUState for interrupt related stuff x86: use caller supplied CPUState for interrupt related stuff sparc: move do_interrupt to helper.c sparc: fix coding style of the area to be moved cpu_loop_exit: avoid using AREG0 Sparc32: dummy implementation of MXCC MMU breakpoint registers Fix fallouts from Linux header inclusion coreaudio: Fix OSStatus format specifier coreaudio: Avoid formatting UInt32 type Conflicts: cpu-exec.c Signed-off-by: Avi Kivity <[email protected]>
Diffstat (limited to 'hw') (more/less context) (ignore whitespace changes)
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/kvmclock.h b/hw/kvmclock.h
index 7a83cbe..252ea13 100644
--- a/hw/kvmclock.h
+++ b/hw/kvmclock.h
@@ -11,4 +11,14 @@
+#ifdef CONFIG_KVM
void kvmclock_create(void);
+#else /* CONFIG_KVM */
+static inline void kvmclock_create(void)
+#endif /* !CONFIG_KVM */