From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjgED-00074k-VC for qemu-devel@nongnu.org; Thu, 21 Nov 2013 21:12:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjgE9-0002Wc-DQ for qemu-devel@nongnu.org; Thu, 21 Nov 2013 21:12:17 -0500 Received: from [222.73.24.84] (port=22173 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjgE8-0002WE-To for qemu-devel@nongnu.org; Thu, 21 Nov 2013 21:12:13 -0500 Message-ID: <528EBD25.4080301@cn.fujitsu.com> Date: Fri, 22 Nov 2013 10:10:45 +0800 From: Wanlong Gao MIME-Version: 1.0 References: <1385086118-11699-1-git-send-email-gaowanlong@cn.fujitsu.com> <1385086118-11699-2-git-send-email-gaowanlong@cn.fujitsu.com> In-Reply-To: <1385086118-11699-2-git-send-email-gaowanlong@cn.fujitsu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH] fixup Reply-To: gaowanlong@cn.fujitsu.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: drjones@redhat.com, ehabkost@redhat.com, lersek@redhat.com, hutao@cn.fujitsu.com, mtosatti@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, bsd@redhat.com, anthony@codemonkey.ws, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Sorry, please ignore this patch. Thanks, Wanlong Gao > Signed-off-by: Wanlong Gao > --- > hw/i386/pc.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 50ed4cc..74c1f16 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1072,8 +1072,12 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, > guest_info->apic_id_limit = pc_apic_id_limit(max_cpus); > guest_info->apic_xrupt_override = kvm_allows_irq0_override(); > guest_info->numa_nodes = nb_numa_nodes; > - guest_info->node_mem = g_memdup(node_mem, guest_info->numa_nodes * > + guest_info->node_mem = g_malloc0(guest_info->numa_nodes * > sizeof *guest_info->node_mem); > + for (i = 0; i < nb_numa_nodes; i++) { > + guest_info->node_mem[i] = numa_info[i].node_mem; > + } > + > guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit * > sizeof *guest_info->node_cpu); > > @@ -1081,7 +1085,7 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, > unsigned int apic_id = x86_cpu_apic_id_from_index(i); > assert(apic_id < guest_info->apic_id_limit); > for (j = 0; j < nb_numa_nodes; j++) { > - if (test_bit(i, node_cpumask[j])) { > + if (test_bit(i, numa_info[j].node_cpu)) { > guest_info->node_cpu[apic_id] = j; > break; > } >