diff options
| author | Igor Mammedov | 2016-10-05 17:51:23 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2016-10-10 00:16:57 +0200 |
| commit | 6bea1ddf8b411dcb0ba5d3a83c4479492185a409 (patch) | |
| tree | 5cb12d18c284631589e3bdf687eeb08130e3f159 /hw/i386/pc.c | |
| parent | virtio-serial: enable virtio console emergency write feature (diff) | |
| download | qemu-6bea1ddf8b411dcb0ba5d3a83c4479492185a409.tar.gz qemu-6bea1ddf8b411dcb0ba5d3a83c4479492185a409.tar.xz qemu-6bea1ddf8b411dcb0ba5d3a83c4479492185a409.zip | |
numa: reduce code duplication by adding helper numa_get_node_for_cpu()
Replace repeated pattern
for (i = 0; i < nb_numa_nodes; i++) {
if (test_bit(idx, numa_info[i].node_cpu)) {
...
break;
with a helper function to lookup numa node index for cpu.
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc.c')
| -rw-r--r-- | hw/i386/pc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2d6d7920ff..93ff49c60b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -779,11 +779,9 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms) for (i = 0; i < max_cpus; i++) { unsigned int apic_id = x86_cpu_apic_id_from_index(i); assert(apic_id < pcms->apic_id_limit); - for (j = 0; j < nb_numa_nodes; j++) { - if (test_bit(i, numa_info[j].node_cpu)) { - numa_fw_cfg[apic_id + 1] = cpu_to_le64(j); - break; - } + j = numa_get_node_for_cpu(i); + if (j < nb_numa_nodes) { + numa_fw_cfg[apic_id + 1] = cpu_to_le64(j); } } for (i = 0; i < nb_numa_nodes; i++) { |