From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTY0Q-0005Ju-HX for qemu-devel@nongnu.org; Thu, 05 Mar 2015 10:48:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTY0K-00045M-DC for qemu-devel@nongnu.org; Thu, 05 Mar 2015 10:48:10 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58491 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTY0K-00044z-78 for qemu-devel@nongnu.org; Thu, 05 Mar 2015 10:48:04 -0500 Message-ID: <54F87AA9.5030004@suse.de> Date: Thu, 05 Mar 2015 16:47:53 +0100 From: =?windows-1252?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1425435224-2630-1-git-send-email-ehabkost@redhat.com> <1425435224-2630-5-git-send-email-ehabkost@redhat.com> <54F7A402.6030103@suse.de> <20150305133726.GU3513@thinpad.lan.raisama.net> In-Reply-To: <20150305133726.GU3513@thinpad.lan.raisama.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 4/5] target-i386: Move APIC ID compatibility code to pc.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Gu Zheng , Igor Mammedov , qemu-devel@nongnu.org, Paolo Bonzini Am 05.03.2015 um 14:37 schrieb Eduardo Habkost: > On Thu, Mar 05, 2015 at 01:32:02AM +0100, Andreas F=E4rber wrote: >> Am 04.03.2015 um 03:13 schrieb Eduardo Habkost: >>> The APIC ID compatibility code is required only for PC, and now that >>> x86_cpu_initfn() doesn't use x86_cpu_apic_id_from_index() anymore, th= at >>> code can be moved to pc.c. >>> >>> Reviewed-by: Paolo Bonzini >>> Reviewed-by: Andreas F=E4rber >>> Signed-off-by: Eduardo Habkost >>> --- >>> hw/i386/pc.c | 35 +++++++++++++++++++++++++++++++++++ >>> target-i386/cpu.c | 34 ---------------------------------- >>> 2 files changed, 35 insertions(+), 34 deletions(-) >>> >>> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >>> index b229856..8c3c470 100644 >>> --- a/hw/i386/pc.c >>> +++ b/hw/i386/pc.c [...] >>> @@ -629,6 +631,39 @@ bool e820_get_entry(int idx, uint32_t type, uint= 64_t *address, uint64_t *length) >>> return false; >>> } >>> =20 >>> +/* Enables contiguous-apic-ID mode, for compatibility */ >>> +static bool compat_apic_id_mode; >>> + >>> +void enable_compat_apic_id_mode(void) >>> +{ >>> + compat_apic_id_mode =3D true; >>> +} >>> + >>> +/* Calculates initial APIC ID for a specific CPU index >>> + * >>> + * Currently we need to be able to calculate the APIC ID from the CP= U index >>> + * alone (without requiring a CPU object), as the QEMU<->Seabios int= erfaces have >>> + * no concept of "CPU index", and the NUMA tables on fw_cfg need the= APIC ID of >>> + * all CPUs up to max_cpus. >>> + */ >>> +uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index) >> >> Looking a bit closer here, as I am poking around its call site for the >> socket modeling, can't this be made static while at it? (If so, don't >> forget to drop the prototype.) >=20 > Yes, I'll make it static. I assume it's OK to do it before committing > instead of resending the series because of that? For me, sure. If you want to go safe or be verbose, you can post the diff as a reply when you apply. Cheers, 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)