From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSUPu-0001Hs-SQ for qemu-devel@nongnu.org; Mon, 02 Mar 2015 12:46:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSUPp-0000B2-78 for qemu-devel@nongnu.org; Mon, 02 Mar 2015 12:46:06 -0500 Received: from cantor2.suse.de ([195.135.220.15]:50770 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSUPo-00006K-VX for qemu-devel@nongnu.org; Mon, 02 Mar 2015 12:46:01 -0500 Message-ID: <54F4A1D6.9050803@suse.de> Date: Mon, 02 Mar 2015 18:45:58 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1424986952-18579-1-git-send-email-ehabkost@redhat.com> <1424986952-18579-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1424986952-18579-4-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 3/5] target-i386: Set APIC ID using cpu_index on legacy cpu_x86_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini Am 26.02.2015 um 22:42 schrieb Eduardo Habkost: > The PC CPU initialization code already sets apic-id based on the CPU > topology, and CONFIG_USER doesn't need the topology-based APIC ID > calculation code. >=20 > Make cpu_x86_init() (used only by CONFIG_USER) set apic-id before > realizing the CPU (just like PC already does), so we can simplify > x86_cpu_initfn later. As there is no CPU topology configuration in > CONFIG_USER, just use cpu_index as the APIC ID. >=20 > Signed-off-by: Eduardo Habkost > --- > Changes v1 -> v2: none > Changes v2 -> v3: > * Use "goto out" instead of "goto error" after patch changing error > handling was removed from the series > --- > target-i386/cpu.c | 6 ++++++ > 1 file changed, 6 insertions(+) >=20 > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 079ce60..c4a96b6 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -2159,6 +2159,12 @@ X86CPU *cpu_x86_init(const char *cpu_model) > goto out; > } > =20 > + object_property_set_int(OBJECT(cpu), CPU(cpu)->cpu_index, "apic-id= ", > + &error); > + if (error) { > + goto out; > + } > + > object_property_set_bool(OBJECT(cpu), true, "realized", &error); > =20 > out: Why do this here? Cf. following patch. Andreas --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG N=FCrnberg)