From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2FLb-0000sP-Sw for qemu-devel@nongnu.org; Thu, 25 Jul 2013 02:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2FLY-0004QY-UO for qemu-devel@nongnu.org; Thu, 25 Jul 2013 02:48:23 -0400 Received: from [222.73.24.84] (port=29000 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2FLY-0004QG-JM for qemu-devel@nongnu.org; Thu, 25 Jul 2013 02:48:20 -0400 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r6P6m36U001378 for ; Thu, 25 Jul 2013 14:48:04 +0800 Message-ID: <1374734807.31121.11.camel@localhost.localdomain> From: chenfan Date: Thu, 25 Jul 2013 14:46:47 +0800 In-Reply-To: <1374733640-9350-1-git-send-email-chen.fan.fnst@cn.fujitsu.com> References: <1374733640-9350-1-git-send-email-chen.fan.fnst@cn.fujitsu.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [PATCH 1/1] cpu: Correct cpu-hotplug failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On Thu, 2013-07-25 at 14:27 +0800, Chen Fan wrote: > When useing x86_64-softmmu --enable-kvm boot qemu, cpu-add command fails to add a vcpu, > there show (KVM: setting VAPIC address failed). > > The reason is that we use an uninitialized cpu->kvm-fd to ioctl. > so we move realizing apic to the back of qemu_init_vcpu. > > Signed-off-by: Chen Fan This is regression is caused by commit c643bed99. > --- > include/qom/cpu.h | 2 ++ > qom/cpu.c | 13 +++++++++++++ > target-i386/cpu.c | 10 ++++------ > 3 files changed, 19 insertions(+), 6 deletions(-) > > diff --git a/include/qom/cpu.h b/include/qom/cpu.h > index daf1835..487a808 100644 > --- a/include/qom/cpu.h > +++ b/include/qom/cpu.h > @@ -80,6 +80,7 @@ struct TranslationBlock; > * @synchronize_from_tb: Callback for synchronizing state from a TCG > * #TranslationBlock. > * @get_phys_page_debug: Callback for obtaining a physical address. > + * @apic_realize: Callback for realizing apic. > * @vmsd: State description for migration. > * > * Represents a CPU family or model. > @@ -108,6 +109,7 @@ typedef struct CPUClass { > void (*set_pc)(CPUState *cpu, vaddr value); > void (*synchronize_from_tb)(CPUState *cpu, struct TranslationBlock *tb); > hwaddr (*get_phys_page_debug)(CPUState *cpu, vaddr addr); > + void (*apic_realize)(CPUState *cpu, Error **errp); > > const struct VMStateDescription *vmsd; > int (*write_elf64_note)(WriteCoreDumpFunction f, CPUState *cpu, > diff --git a/qom/cpu.c b/qom/cpu.c > index 5c45ab5..88c6028 100644 > --- a/qom/cpu.c > +++ b/qom/cpu.c > @@ -213,12 +213,25 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model) > return NULL; > } > > +static void cpu_apic_realize(CPUState *cpu, Error **errp) > +{ > + CPUClass *cc = CPU_GET_CLASS(cpu); > + if (cc->apic_realize != NULL) { > + (*cc->apic_realize)(cpu, errp); > + } > +} > + > static void cpu_common_realizefn(DeviceState *dev, Error **errp) > { > CPUState *cpu = CPU(dev); > > qemu_init_vcpu(cpu); > > + cpu_apic_realize(cpu, errp); > + if (error_is_set(errp)) { > + return; > + } > + > if (dev->hotplugged) { > cpu_synchronize_post_init(cpu); > notifier_list_notify(&cpu_added_notifiers, dev); > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index cd350cb..916d69e 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -2311,8 +2311,9 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) > apic->cpu = cpu; > } > > -static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) > +static void x86_cpu_apic_realize(CPUState *s, Error **errp) > { > + X86CPU *cpu = X86_CPU(s); > CPUX86State *env = &cpu->env; > > if (env->apic_state == NULL) { > @@ -2326,7 +2327,7 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) > } > } > #else > -static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) > +static void x86_cpu_apic_realize(CPUState *s, Error **errp) > { > } > #endif > @@ -2388,10 +2389,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > > mce_init(cpu); > > - x86_cpu_apic_realize(cpu, &local_err); > - if (local_err != NULL) { > - goto out; > - } > cpu_reset(CPU(cpu)); > > xcc->parent_realize(dev, &local_err); > @@ -2540,6 +2537,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) > cc->synchronize_from_tb = x86_cpu_synchronize_from_tb; > cc->get_arch_id = x86_cpu_get_arch_id; > cc->get_paging_enabled = x86_cpu_get_paging_enabled; > + cc->apic_realize = x86_cpu_apic_realize; > #ifndef CONFIG_USER_ONLY > cc->get_memory_mapping = x86_cpu_get_memory_mapping; > cc->get_phys_page_debug = x86_cpu_get_phys_page_debug;