summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorWei Yang <richardw.yang@linux.intel.com>2019-03-21 16:25:52 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2019-09-16 12:32:20 +0200
commitc95cfd040078db8017f74fd3a4d6f798385d960c (patch)
tree42212776fe9a05bd0c2feb4c963985c95ef90e5f
parent56b15076805a29673c1a90ea9c3ebef25bfcc912 (diff)
downloadfocaccia-qemu-c95cfd040078db8017f74fd3a4d6f798385d960c.tar.gz
focaccia-qemu-c95cfd040078db8017f74fd3a4d6f798385d960c.zip
exec.c: get nodes_nb_alloc with one MAX calculation
The purpose of these two MAX here is to get the maximum of these three
variables:

    A: map->nodes_nb + nodes
    B: map->nodes_nb_alloc
    C: alloc_hint

We can write it like MAX(A, B, C). Since the if condition says A > B,
this means MAX(A, B, C) = MAX(A, C).

This patch just simplify the calculation a bit.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190321082555.21118-4-richardw.yang@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--exec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/exec.c b/exec.c
index 8e0c400de8..ff3cb3e25b 100644
--- a/exec.c
+++ b/exec.c
@@ -227,8 +227,7 @@ static void phys_map_node_reserve(PhysPageMap *map, unsigned nodes)
 {
     static unsigned alloc_hint = 16;
     if (map->nodes_nb + nodes > map->nodes_nb_alloc) {
-        map->nodes_nb_alloc = MAX(map->nodes_nb_alloc, alloc_hint);
-        map->nodes_nb_alloc = MAX(map->nodes_nb_alloc, map->nodes_nb + nodes);
+        map->nodes_nb_alloc = MAX(alloc_hint, map->nodes_nb + nodes);
         map->nodes = g_renew(Node, map->nodes, map->nodes_nb_alloc);
         alloc_hint = map->nodes_nb_alloc;
     }