[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/40] numa: Fix QMP command set-numa-node error hand
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 17/40] numa: Fix QMP command set-numa-node error handling |
Date: |
Mon, 22 Oct 2018 14:33:50 +0200 |
Calling error_report() in a function that takes an Error ** argument
is suspicious. parse_numa_node() does that, and then exit()s. It
also passes &error_fatal to machine_set_cpu_numa_node(). Both wrong.
Attempting to configure numa when the machine doesn't support it kills
the VM:
$ qemu-system-x86_64 -nodefaults -S -display none -M none -preconfig -qmp
stdio
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 0, "major": 3},
"package": "v3.0.0-837-gc5e4e49258"}, "capabilities": []}}
{"execute": "qmp_capabilities"}
{"return": {}}
{"execute": "set-numa-node", "arguments": {"type": "node"}}
NUMA is not supported by this machine-type
$ echo $?
1
Messed up when commit 64c2a8f6d3f and 7c88e65d9e9 (v2.10.0) added
incorrect error handling right next to correct examples. Latent bug
until commit f3be67812c2 (v3.0.0) made it accessible via QMP. Fairly
harmless in practice, because it's limited to RUN_STATE_PRECONFIG.
The fix is obvious: replace error_report(); exit() by error_setg();
return.
This affects parse_numa_node()'s other caller
numa_complete_configuration(): since it ignores errors, the "NUMA is
not supported by this machine-type" is now ignored, too. But that
error is as unexpected there as any other. Change it to abort on
error instead.
Fixes: f3be67812c226162f86ce92634bd913714445420
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
---
numa.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/numa.c b/numa.c
index 81542d4ebb..1d7c49ad43 100644
--- a/numa.c
+++ b/numa.c
@@ -60,6 +60,7 @@ NodeInfo numa_info[MAX_NODES];
static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
Error **errp)
{
+ Error *err = NULL;
uint16_t nodenr;
uint16List *cpus = NULL;
MachineClass *mc = MACHINE_GET_CLASS(ms);
@@ -82,8 +83,8 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions
*node,
}
if (!mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id) {
- error_report("NUMA is not supported by this machine-type");
- exit(1);
+ error_setg(errp, "NUMA is not supported by this machine-type");
+ return;
}
for (cpus = node->cpus; cpus; cpus = cpus->next) {
CpuInstanceProperties props;
@@ -97,7 +98,11 @@ static void parse_numa_node(MachineState *ms,
NumaNodeOptions *node,
props = mc->cpu_index_to_instance_props(ms, cpus->value);
props.node_id = nodenr;
props.has_node_id = true;
- machine_set_cpu_numa_node(ms, &props, &error_fatal);
+ machine_set_cpu_numa_node(ms, &props, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
}
if (node->has_mem && node->has_memdev) {
@@ -367,7 +372,7 @@ void numa_complete_configuration(MachineState *ms)
if (ms->ram_slots > 0 && nb_numa_nodes == 0 &&
mc->auto_enable_numa_with_memhp) {
NumaNodeOptions node = { };
- parse_numa_node(ms, &node, NULL);
+ parse_numa_node(ms, &node, &error_abort);
}
assert(max_numa_nodeid <= MAX_NODES);
--
2.17.2
- [Qemu-devel] [PULL 39/40] vpc: Fail open on bad header checksum, (continued)
- [Qemu-devel] [PULL 39/40] vpc: Fail open on bad header checksum, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 20/40] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 30/40] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 08/40] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 16/40] net/socket: Fix invalid socket type error handling, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 19/40] seccomp: Clean up error reporting in parse_sandbox(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 28/40] ui: Convert vnc_display_init(), init_keyboard_layout() to Error, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 33/40] fsdev: Clean up error reporting in qemu_fsdev_add(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 09/40] char: Use error_printf() to print help and such, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 21/40] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 17/40] numa: Fix QMP command set-numa-node error handling,
Markus Armbruster <=
- [Qemu-devel] [PULL 13/40] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 14/40] migration: Fix !replay_can_snapshot() error handling, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 02/40] vl: Print error when using incorrect backend for debugcon, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 29/40] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 26/40] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 34/40] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 36/40] vl: Fix exit status for -drive format=help, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 15/40] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 37/40] vl: Simplify call of parse_name(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 31/40] tpm: Clean up error reporting in tpm_init_tpmdev(), Markus Armbruster, 2018/10/22