| Message ID | 1243921342-17704-1-git-send-email-glommer@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Glauber Costa wrote: > There's nothing kvm specific in get_cpu function. Remove it from > kvm ifdef. Buy us a cleaner code, and may help us with any attempt > of integrating this on the future. > > Signed-off-by: Glauber Costa <glommer@redhat.com> > --- > hw/acpi.c | 12 +++--------- > 1 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/hw/acpi.c b/hw/acpi.c > index f4062ac..7f23e4e 100644 > --- a/hw/acpi.c > +++ b/hw/acpi.c > @@ -770,9 +770,7 @@ static void disable_processor(struct gpe_regs *g, int cpu) > g->cpus_sts[cpu/8] &= ~(1 << (cpu%8)); > } > > -#if defined(TARGET_I386) || defined(TARGET_X86_64) > -#ifdef USE_KVM > -static CPUState *qemu_kvm_cpu_env(int index) > +static CPUState *qemu_get_cpu_env(int index) > { > CPUState *penv; > > @@ -786,18 +784,14 @@ static CPUState *qemu_kvm_cpu_env(int index) > > return NULL; > } > -#endif > Want this cause an undefined function warning on non-x86 targets? If you send two identical patches, please version them and note the changes.
diff --git a/hw/acpi.c b/hw/acpi.c index f4062ac..7f23e4e 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -770,9 +770,7 @@ static void disable_processor(struct gpe_regs *g, int cpu) g->cpus_sts[cpu/8] &= ~(1 << (cpu%8)); } -#if defined(TARGET_I386) || defined(TARGET_X86_64) -#ifdef USE_KVM -static CPUState *qemu_kvm_cpu_env(int index) +static CPUState *qemu_get_cpu_env(int index) { CPUState *penv; @@ -786,18 +784,14 @@ static CPUState *qemu_kvm_cpu_env(int index) return NULL; } -#endif +#if defined(TARGET_I386) || defined(TARGET_X86_64) void qemu_system_cpu_hot_add(int cpu, int state) { CPUState *env; - if (state -#ifdef USE_KVM - && (!qemu_kvm_cpu_env(cpu)) -#endif - ) { + if (state && (!qemu_get_cpu_env(cpu))) { env = pc_new_cpu(cpu, model, 1); if (!env) { fprintf(stderr, "cpu %d creation failed\n", cpu);
There's nothing kvm specific in get_cpu function. Remove it from kvm ifdef. Buy us a cleaner code, and may help us with any attempt of integrating this on the future. Signed-off-by: Glauber Costa <glommer@redhat.com> --- hw/acpi.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-)