| Message ID | 1265294782-28112-1-git-send-email-amit.shah@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 02/04/2010 08:46 AM, Amit Shah wrote: > We have some duplicated code in the CONFIG_IOTHREAD #ifdef and #else > cases. Fix that. > > Signed-off-by: Amit Shah<amit.shah@redhat.com> > Applied. Thanks. Regards, Anthony Liguori > --- > kvm-all.c | 9 +++------ > 1 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/kvm-all.c b/kvm-all.c > index 15ec38e..a2bd78e 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -901,14 +901,11 @@ void kvm_setup_guest_memory(void *start, size_t size) > static void on_vcpu(CPUState *env, void (*func)(void *data), void *data) > { > #ifdef CONFIG_IOTHREAD > - if (env == cpu_single_env) { > - func(data); > - return; > + if (env != cpu_single_env) { > + abort(); > } > - abort(); > -#else > - func(data); > #endif > + func(data); > } > > struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env, >
diff --git a/kvm-all.c b/kvm-all.c index 15ec38e..a2bd78e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -901,14 +901,11 @@ void kvm_setup_guest_memory(void *start, size_t size) static void on_vcpu(CPUState *env, void (*func)(void *data), void *data) { #ifdef CONFIG_IOTHREAD - if (env == cpu_single_env) { - func(data); - return; + if (env != cpu_single_env) { + abort(); } - abort(); -#else - func(data); #endif + func(data); } struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env,
We have some duplicated code in the CONFIG_IOTHREAD #ifdef and #else cases. Fix that. Signed-off-by: Amit Shah <amit.shah@redhat.com> --- kvm-all.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)