From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgUr-00040R-4i for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIgUe-0004Df-QA for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgUe-0004BA-IT for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:24 -0400 From: Igor Mammedov Date: Thu, 21 Mar 2013 15:28:35 +0100 Message-Id: <1363876125-8264-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1363876125-8264-1-git-send-email-imammedo@redhat.com> References: <1363876125-8264-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 02/12] target-i386: split APIC creation from initialization in x86_cpu_realizefn() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, stefano.stabellini@eu.citrix.com, claudio.fontana@huawei.com, armbru@redhat.com, quintela@redhat.com, lcapitulino@redhat.com, blauwirbel@gmail.com, yang.z.zhang@intel.com, alex.williamson@redhat.com, aderumier@odiso.com, kraxel@redhat.com, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net When APIC is hotplugged during CPU hotplug, device_set_realized() calls device_reset() on it. And if QEMU runs in KVM mode, following call chain will fail: apic_reset_common() -> kvm_apic_vapic_base_update() -> kvm_vcpu_ioctl(cpu->kvm_fd,...) due to cpu->kvm_fd not being initialized yet. cpu->kvm_fd is initialized during qemu_init_vcpu() call but x86_cpu_apic_init() can't be moved after it because kvm_init_vcpu() -> kvm_arch_reset_vcpu() relies on APIC to determine if CPU is BSP for setting initial env->mp_state. So split APIC device creation from its initialization and realize APIC after CPU is created, when it's safe to call APIC's reset method. Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e905bcf..affbb76 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2051,9 +2051,8 @@ static void mce_init(X86CPU *cpu) #define MSI_ADDR_BASE 0xfee00000 #ifndef CONFIG_USER_ONLY -static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) +static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) { - static int apic_mapped; CPUX86State *env = &cpu->env; APICCommonState *apic; const char *apic_type = "apic"; @@ -2076,6 +2075,16 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) /* TODO: convert to link<> */ apic = APIC_COMMON(env->apic_state); apic->cpu = cpu; +} + +static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) +{ + CPUX86State *env = &cpu->env; + static int apic_mapped; + + if (env->apic_state == NULL) { + return; + } if (qdev_init(env->apic_state)) { error_setg(errp, "APIC device '%s' could not be initialized", @@ -2093,6 +2102,10 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) apic_mapped = 1; } } +#else +static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) +{ +} #endif static void x86_cpu_realizefn(DeviceState *dev, Error **errp) @@ -2143,7 +2156,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) qemu_register_reset(x86_cpu_machine_reset_cb, cpu); if (cpu->env.cpuid_features & CPUID_APIC || smp_cpus > 1) { - x86_cpu_apic_init(cpu, &local_err); + x86_cpu_apic_create(cpu, &local_err); if (local_err != NULL) { goto out; } @@ -2152,6 +2165,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) mce_init(cpu); qemu_init_vcpu(&cpu->env); + + x86_cpu_apic_init(cpu, &local_err); + if (local_err != NULL) { + goto out; + } cpu_reset(CPU(cpu)); xcc->parent_realize(dev, &local_err); -- 1.7.1