diff options
author | Avi Kivity <avi@redhat.com> | 2009-07-29 10:37:24 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-07-29 10:37:43 +0300 |
commit | 660caae82afbbf8a96c6559ba7580944d0f5f914 (patch) | |
tree | 0b1ec9ab2ca6954052f8ed493e199f545ff6954a /kvm-all.c | |
parent | Merge commit 'baef8a666c137fae513a195c8abeb80e1806d7bd' into upstream-merge (diff) | |
parent | Fix broken build (diff) | |
download | qemu-kvm-660caae82afbbf8a96c6559ba7580944d0f5f914.tar.gz qemu-kvm-660caae82afbbf8a96c6559ba7580944d0f5f914.tar.bz2 qemu-kvm-660caae82afbbf8a96c6559ba7580944d0f5f914.zip |
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>
Diffstat (limited to 'kvm-all.c')
-rw-r--r-- | kvm-all.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -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) { |