From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZqOB-0007JH-NJ for qemu-devel@nongnu.org; Wed, 09 Sep 2015 21:11:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZqO7-00049r-MZ for qemu-devel@nongnu.org; Wed, 09 Sep 2015 21:10:59 -0400 Received: from [59.151.112.132] (port=28933 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZqO7-00048e-Aq for qemu-devel@nongnu.org; Wed, 09 Sep 2015 21:10:55 -0400 Message-ID: <55F0D846.4010506@cn.fujitsu.com> Date: Thu, 10 Sep 2015 09:09:26 +0800 From: Zhu Guihua MIME-Version: 1.0 References: <1440149685-14057-1-git-send-email-zhugh.fnst@cn.fujitsu.com> <55ED7511.6020507@redhat.com> <55ED9D92.5010506@suse.de> <20150909161122.GI3574@thinpad.lan.raisama.net> In-Reply-To: <20150909161122.GI3574@thinpad.lan.raisama.net> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] cpu: introduce CpuTopoInfo structure for argument simplification List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , =?windows-1252?Q?Andreas_F=E4?= =?windows-1252?Q?rber?= Cc: Chen Fan , Paolo Bonzini , imammedo@redhat.com, qemu-devel@nongnu.org, mst@redhat.com On 09/10/2015 12:11 AM, Eduardo Habkost wrote: > On Mon, Sep 07, 2015 at 04:22:10PM +0200, Andreas F=E4rber wrote: >> Am 07.09.2015 um 13:29 schrieb Paolo Bonzini: >>> On 21/08/2015 11:34, Zhu Guihua wrote: >>>> @@ -107,14 +111,12 @@ static inline apic_id_t apicid_from_topo_ids(uns= igned nr_cores, >>>> static inline void x86_topo_ids_from_idx(unsigned nr_cores, >>>> unsigned nr_threads, >>>> unsigned cpu_index, >>>> - unsigned *pkg_id, >>>> - unsigned *core_id, >>>> - unsigned *smt_id) >>>> + X86CPUTopoInfo *topo) >>>> { >>> Isn't this function used in hw/i386/pc.c as well? >> In case it gets respun now, in Seattle I had asked Eduardo to update the >> subject with s/CpuTopoInfo/X86CPUTopoInfo/. > I have fixed the subject line when applying to x86, and now added the > following fix to the patch to avoid a respin: > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 9f2924e..c515fca 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1938,10 +1938,10 @@ static void pc_machine_initfn(Object *obj) > =20 > static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index) > { > - unsigned pkg_id, core_id, smt_id; > + X86CPUTopoInfo topo; > x86_topo_ids_from_idx(smp_cores, smp_threads, cpu_index, > - &pkg_id, &core_id, &smt_id); > - return pkg_id; > + &topo); > + return topo.pkg_id; > } > =20 > static void pc_machine_class_init(ObjectClass *oc, void *data) > I am sorry for my carelessness, thanks for your work. Regards, Zhu