On Wed, May 03, 2017 at 02:57:13PM +0200, Igor Mammedov wrote:
> CPUState::numa_node is still in use but now it's set by
> board when it creates CPU objects. So there isn't any
> need to set it again after all CPU's are created,
> since it's been already set.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/sysemu/numa.h | 1 -
> numa.c | 15 ---------------
> vl.c | 2 --
> 3 files changed, 18 deletions(-)
>
> diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
> index 9077bb2..0b0a044 100644
> --- a/include/sysemu/numa.h
> +++ b/include/sysemu/numa.h
> @@ -25,7 +25,6 @@ typedef struct node_info {
>
> extern NodeInfo numa_info[MAX_NODES];
> void parse_numa_opts(MachineState *ms);
> -void numa_post_machine_init(void);
> void query_numa_node_mem(uint64_t node_mem[]);
> extern QemuOptsList qemu_numa_opts;
> void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node);
> diff --git a/numa.c b/numa.c
> index 06c42e9..f8c849d 100644
> --- a/numa.c
> +++ b/numa.c
> @@ -418,21 +418,6 @@ void parse_numa_opts(MachineState *ms)
> }
> }
>
> -void numa_post_machine_init(void)
> -{
> - CPUState *cpu;
> - int i;
> -
> - CPU_FOREACH(cpu) {
> - for (i = 0; i < nb_numa_nodes; i++) {
> - assert(cpu->cpu_index < max_cpus);
> - if (test_bit(cpu->cpu_index, numa_info[i].node_cpu)) {
> - cpu->numa_node = i;
> - }
> - }
> - }
> -}
> -
> static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,
> const char *name,
> uint64_t ram_size)
> diff --git a/vl.c b/vl.c
> index c63f4d5..fe4741d 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4595,8 +4595,6 @@ int main(int argc, char **argv, char **envp)
>
> cpu_synchronize_all_post_init();
>
> - numa_post_machine_init();
> -
> rom_reset_order_override();
>
> /*
> --
> 2.7.4
>
Reviewed-by: Andrew Jones <drjones@redhat.com>