Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190903' into staging

[mirror_qemu.git] / exec.c

diff --git a/exec.c b/exec.c
index ad0f4a598f8d55bf3ff8dc6866f8c205b631a974..235d6bc88323432899f4f10b7f292548facc4df0 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1724,6 +1724,7 @@ long qemu_minrampagesize(void)
     long hpsize = LONG_MAX;
     long mainrampagesize;
     Object *memdev_root;
+    MachineState *ms = MACHINE(qdev_get_machine());
 
     mainrampagesize = qemu_mempath_getpagesize(mem_path);
 
@@ -1751,7 +1752,9 @@ long qemu_minrampagesize(void)
      * so if its page size is smaller we have got to report that size instead.
      */
     if (hpsize > mainrampagesize &&
-        (nb_numa_nodes == 0 || numa_info[0].node_memdev == NULL)) {
+        (ms->numa_state == NULL ||
+         ms->numa_state->num_nodes == 0 ||
+         ms->numa_state->nodes[0].node_memdev == NULL)) {
         static bool warned;
         if (!warned) {
             error_report("Huge page support disabled (n/a for main memory).");