[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/40] numa: Clean up error reporting in parse_numa()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 30/40] numa: Clean up error reporting in parse_numa() |
Date: |
Mon, 22 Oct 2018 14:34:03 +0200 |
Calling error_report() in a function that takes an Error ** argument
is suspicious. parse_numa() does that, and then fails without setting
an error. Its caller main(), via qemu_opts_foreach(), is fine with
it, but clean it up anyway.
While there, give parse_numa() internal linkage.
Cc: Eduardo Habkost <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
---
include/sysemu/numa.h | 1 -
numa.c | 8 +++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index 7a0ae751aa..21713b7e2f 100644
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -22,7 +22,6 @@ struct NumaNodeMem {
};
extern NodeInfo numa_info[MAX_NODES];
-int parse_numa(void *opaque, QemuOpts *opts, Error **errp);
void parse_numa_opts(MachineState *ms);
void numa_complete_configuration(MachineState *ms);
void query_numa_node_mem(NumaNodeMem node_mem[]);
diff --git a/numa.c b/numa.c
index 1d7c49ad43..50ec016013 100644
--- a/numa.c
+++ b/numa.c
@@ -215,7 +215,7 @@ end:
error_propagate(errp, err);
}
-int parse_numa(void *opaque, QemuOpts *opts, Error **errp)
+static int parse_numa(void *opaque, QemuOpts *opts, Error **errp)
{
NumaOptions *object = NULL;
MachineState *ms = MACHINE(opaque);
@@ -239,7 +239,7 @@ int parse_numa(void *opaque, QemuOpts *opts, Error **errp)
end:
qapi_free_NumaOptions(object);
if (err) {
- error_report_err(err);
+ error_propagate(errp, err);
return -1;
}
@@ -444,9 +444,7 @@ void numa_complete_configuration(MachineState *ms)
void parse_numa_opts(MachineState *ms)
{
- if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
- exit(1);
- }
+ qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, &error_fatal);
}
void qmp_set_numa_node(NumaOptions *cmd, Error **errp)
--
2.17.2
- [Qemu-devel] [PULL 05/40] block: Use warn_report() & friends to report warnings, (continued)
- [Qemu-devel] [PULL 05/40] block: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 12/40] ioapic: Fix error handling in realize(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 27/40] ui/keymaps: Fix handling of erroneous include files, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 10/40] 9pfs: Fix CLI parsing crash on error, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 25/40] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 24/40] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 22/40] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 35/40] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/22
- [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 <=
- [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, 2018/10/22
- [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