Merge commit 'fc5d642fcae392bbc9fed9ac6bc78ac29ed48372' into upstream-merge

* commit 'fc5d642fcae392bbc9fed9ac6bc78ac29ed48372':
  Fix broken build
  slirp: Use monotonic clock if available (v2)
  slirp: Remove UDP protocol emulation (talk, cuseeme)
  qemu: msix nit: clear msix_entries_nr on error

Fix build failure in on_vcpu()

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/kvm-all.c b/kvm-all.c
index f346162f1..6f0bab901 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -156,15 +156,6 @@ static void kvm_reset_vcpu(void *opaque)
     }
 }
 
-static void on_vcpu(CPUState *env, void (*func)(void *data), void *data)
-{
-    if (env == cpu_single_env) {
-        func(data);
-        return;
-    }
-    abort();
-}
-
 int kvm_irqchip_in_kernel(void)
 {
     return kvm_state->irqchip_in_kernel;
@@ -916,6 +907,18 @@ void kvm_setup_guest_memory(void *start, size_t size)
 #endif /* KVM_UPSTREAM */
 
 #ifdef KVM_CAP_SET_GUEST_DEBUG
+
+#ifdef KVM_UPSTREAM
+static void on_vcpu(CPUState *env, void (*func)(void *data), void *data)
+{
+    if (env == cpu_single_env) {
+        func(data);
+        return;
+    }
+    abort();
+}
+#endif /* KVM_UPSTREAM */
+
 struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env,
                                                  target_ulong pc)
 {