[Qemu-devel] Build currently broken

[Luiz Capitulino]

 Hi Glauber,

 Very latest Anthony's tree doesn't build for me:

"""
cc1: warnings being treated as errors
/home/lcapitulino/src/rh-internal/qemu-qmp/kvm-all.c:158: error: ‘on_vcpu’ 
defined but not used
make[1]: *** [kvm-all.o] Error 1
make: *** [subdir-x86_64-softmmu] Error 2
"""

 The culprit seems to be 452e475196a3f8b6b96d16bbaca727ebc1278a97 . The
only user of on_vcpu() is protected by #ifdef KVM_CAP_SET_GUEST_DEBUG.

 The patch below fixes it for me.

---

    Fix broken build
    
    The only caller of on_vcpu() is protected by ifdef
    KVM_CAP_SET_GUEST_DEBUG, so protect on_vcpu() too otherwise QEMU
    may to build.
    
    Signed-off-by: Luiz Capitulino <address@hidden>

diff --git a/kvm-all.c b/kvm-all.c
index 824bb4c..70507b1 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -155,15 +155,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;
@@ -906,6 +897,15 @@ void kvm_setup_guest_memory(void *start, size_t size)
 }
 
 #ifdef KVM_CAP_SET_GUEST_DEBUG
+static void on_vcpu(CPUState *env, void (*func)(void *data), void *data)
+{
+    if (env == cpu_single_env) {
+        func(data);
+        return;
+    }
+    abort();
+}
+
 struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env,
                                                  target_ulong pc)
 {