From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwZc2-00053a-2Q for qemu-devel@nongnu.org; Wed, 01 Aug 2012 10:09:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwZbx-0006ib-Tu for qemu-devel@nongnu.org; Wed, 01 Aug 2012 10:09:21 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57085 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwZbx-0006iR-I5 for qemu-devel@nongnu.org; Wed, 01 Aug 2012 10:09:17 -0400 Message-ID: <50193888.70308@suse.de> Date: Wed, 01 Aug 2012 16:09:12 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1343049748-11539-1-git-send-email-imammedo@redhat.com> <1343049748-11539-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1343049748-11539-3-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/2] target-i386: move cpu_reset and reset callback to cpu.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, ehabkost@redhat.com, gleb@redhat.com, jan.kiszka@siemens.com, mtosatti@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com Am 23.07.2012 15:22, schrieb Igor Mammedov: > Moving reset callback into cpu object from board level and > resetting cpu at the end of x86_cpu_realize() will allow properly > create cpu object during run-time (hotplug) without calling reset exter= naly. >=20 > When reset over QOM hierarchy is implemented, reset callback > should be removed. >=20 > v2: > - leave cpu_reset in pc_new_cpu() for now, it's to be cleaned up when= APIC > init is moved in cpu.c >=20 > Signed-off-by: Igor Mammedov It's still not clear to me what this buys us. Wouldn't it be sufficient to add the cpu_reset() call in x86_cpu_realize()? Otherwise this defers from all other machines, so I'd rather do it completely or not at all. Especially since it's only an interim solution. Andreas > --- > hw/pc.c | 9 +-------- > target-i386/cpu.c | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 8 deletions(-) >=20 > diff --git a/hw/pc.c b/hw/pc.c > index a920686..bd193f3 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -904,12 +904,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, = int level) > } > } > =20 > -static void pc_cpu_reset(void *opaque) > -{ > - X86CPU *cpu =3D opaque; > - cpu_reset(CPU(cpu)); > -} > - > static X86CPU *pc_new_cpu(const char *cpu_model) > { > X86CPU *cpu; > @@ -924,8 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model) > if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { > env->apic_state =3D apic_init(env, env->cpuid_apic_id); > } > - qemu_register_reset(pc_cpu_reset, cpu); > - pc_cpu_reset(cpu); > + cpu_reset(CPU(cpu)); > return cpu; > } > =20 > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index cf612a8..60b8e13 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -31,6 +31,8 @@ > =20 > #include "hyperv.h" > =20 > +#include "hw/hw.h" > + > /* feature flags taken from "Intel Processor Identification and the CP= UID > * Instruction" and AMD's "CPUID Specification". In cases of disagree= ment > * between feature naming conventions, aliases may be added. > @@ -1702,6 +1704,13 @@ bool cpu_is_bsp(X86CPU *cpu) > { > return cpu_get_apic_base(cpu->env.apic_state) & MSR_IA32_APICBASE_= BSP; > } > + > +/* TODO: remove me, when reset over QOM tree is implemented */ > +static void x86_cpu_machine_reset_cb(void *opaque) > +{ > + X86CPU *cpu =3D opaque; > + cpu_reset(CPU(cpu)); > +} > #endif > =20 > static void mce_init(X86CPU *cpu) > @@ -1724,8 +1733,13 @@ void x86_cpu_realize(Object *obj, Error **errp) > { > X86CPU *cpu =3D X86_CPU(obj); > =20 > +#ifndef CONFIG_USER_ONLY > + qemu_register_reset(x86_cpu_machine_reset_cb, cpu); > +#endif > + > mce_init(cpu); > qemu_init_vcpu(&cpu->env); > + cpu_reset(CPU(cpu)); > } > =20 > static void x86_cpu_initfn(Object *obj) >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg