[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/12] numa: postpone options post-processing till ma
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 02/12] numa: postpone options post-processing till machine_run_board_init() |
Date: |
Wed, 30 May 2018 20:05:18 -0300 |
From: Igor Mammedov <address@hidden>
in preparation for numa options to being handled via QMP before
machine_run_board_init(), move final numa configuration checks
and processing to machine_run_board_init() so it could take into
account both CLI (via parse_numa_opts()) and QMP input
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/sysemu/numa.h | 1 +
hw/core/machine.c | 5 +++--
numa.c | 13 ++++++++-----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index d99e5474b4..21713b7e2f 100644
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -23,6 +23,7 @@ struct NumaNodeMem {
extern NodeInfo numa_info[MAX_NODES];
void parse_numa_opts(MachineState *ms);
+void numa_complete_configuration(MachineState *ms);
void query_numa_node_mem(NumaNodeMem node_mem[]);
extern QemuOptsList qemu_numa_opts;
void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 2040177664..617e5f8d75 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -737,7 +737,7 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
return g_string_free(s, false);
}
-static void machine_numa_finish_init(MachineState *machine)
+static void machine_numa_finish_cpu_init(MachineState *machine)
{
int i;
bool default_mapping;
@@ -792,7 +792,8 @@ void machine_run_board_init(MachineState *machine)
MachineClass *machine_class = MACHINE_GET_CLASS(machine);
if (nb_numa_nodes) {
- machine_numa_finish_init(machine);
+ numa_complete_configuration(machine);
+ machine_numa_finish_cpu_init(machine);
}
/* If the machine supports the valid_cpu_types check and the user
diff --git a/numa.c b/numa.c
index efc78b2f17..ad1d7934f2 100644
--- a/numa.c
+++ b/numa.c
@@ -338,15 +338,11 @@ void numa_default_auto_assign_ram(MachineClass *mc,
NodeInfo *nodes,
nodes[i].node_mem = size - usedmem;
}
-void parse_numa_opts(MachineState *ms)
+void numa_complete_configuration(MachineState *ms)
{
int i;
MachineClass *mc = MACHINE_GET_CLASS(ms);
- if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
- exit(1);
- }
-
/*
* If memory hotplug is enabled (slots > 0) but without '-numa'
* options explicitly on CLI, guestes will break.
@@ -433,6 +429,13 @@ void parse_numa_opts(MachineState *ms)
}
}
+void parse_numa_opts(MachineState *ms)
+{
+ if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
+ exit(1);
+ }
+}
+
void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp)
{
int node_id = object_property_get_int(OBJECT(dev), "node-id",
&error_abort);
--
2.17.1
- [Qemu-devel] [PULL 00/12] NUMA queue, 2018-05-30, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 01/12] numa: clarify error message when node index is out of range in -numa dist, ..., Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 02/12] numa: postpone options post-processing till machine_run_board_init(),
Eduardo Habkost <=
- [Qemu-devel] [PULL 03/12] numa: split out NumaOptions parsing into set_numa_options(), Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 04/12] qapi: introduce preconfig runstate, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 05/12] hmp: disable monitor in preconfig state, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 06/12] qapi: introduce new cmd option "allow-preconfig", Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 07/12] tests: qapi-schema tests for allow-preconfig, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 09/12] tests: extend qmp test with preconfig checks, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 08/12] cli: add --preconfig option, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 10/12] qmp: permit query-hotpluggable-cpus in preconfig state, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 11/12] qmp: add set-numa-node command, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 12/12] tests: functional tests for QMP command set-numa-node, Eduardo Habkost, 2018/05/30