| Message ID | 1247678532-7504-1-git-send-email-glommer@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jul 15, 2009 at 01:22:12PM -0400, Glauber Costa wrote: > We now have an upstream qemu function that does exactly that, > but in a kvm-independent way. Use it. > > Signed-off-by: Glauber Costa <glommer@redhat.com> > --- > hw/acpi.c | 24 +----------------------- > 1 files changed, 1 insertions(+), 23 deletions(-) > > diff --git a/hw/acpi.c b/hw/acpi.c > index 7de9cb7..d23abd1 100644 > --- a/hw/acpi.c > +++ b/hw/acpi.c > @@ -775,33 +775,11 @@ static void disable_processor(struct gpe_regs *g, int cpu) > } > > #if defined(TARGET_I386) || defined(TARGET_X86_64) > -#ifdef CONFIG_KVM > -static CPUState *qemu_kvm_cpu_env(int index) > -{ > - CPUState *penv; > - > - penv = first_cpu; > - > - while (penv) { > - if (penv->cpu_index == index) > - return penv; > - penv = (CPUState *)penv->next_cpu; > - } > - > - return NULL; > -} > -#endif > - > - > void qemu_system_cpu_hot_add(int cpu, int state) > { > CPUState *env; > > - if (state > -#ifdef CONFIG_KVM > - && (!qemu_kvm_cpu_env(cpu)) > -#endif > - ) { > + if (state && !qemu_get_cpu(cpu)) { > env = pc_new_cpu(model); > if (!env) { > fprintf(stderr, "cpu %d creation failed\n", cpu); Applied, thanks (did not apply the previous patchset because of the return error handling issue). -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/hw/acpi.c b/hw/acpi.c index 7de9cb7..d23abd1 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -775,33 +775,11 @@ static void disable_processor(struct gpe_regs *g, int cpu) } #if defined(TARGET_I386) || defined(TARGET_X86_64) -#ifdef CONFIG_KVM -static CPUState *qemu_kvm_cpu_env(int index) -{ - CPUState *penv; - - penv = first_cpu; - - while (penv) { - if (penv->cpu_index == index) - return penv; - penv = (CPUState *)penv->next_cpu; - } - - return NULL; -} -#endif - - void qemu_system_cpu_hot_add(int cpu, int state) { CPUState *env; - if (state -#ifdef CONFIG_KVM - && (!qemu_kvm_cpu_env(cpu)) -#endif - ) { + if (state && !qemu_get_cpu(cpu)) { env = pc_new_cpu(model); if (!env) { fprintf(stderr, "cpu %d creation failed\n", cpu);
We now have an upstream qemu function that does exactly that, but in a kvm-independent way. Use it. Signed-off-by: Glauber Costa <glommer@redhat.com> --- hw/acpi.c | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-)