| Message ID | 1385086118-11699-2-git-send-email-gaowanlong@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
Sorry, please ignore this patch. Thanks, Wanlong Gao > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> > --- > 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; > } >
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; }
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- hw/i386/pc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)