mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
numa: Clean up error reporting in parse_numa()
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 <ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20181017082702.5581-29-armbru@redhat.com>
This commit is contained in:
parent
612aea2017
commit
4f7ec696f4
|
@ -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[]);
|
||||
|
|
8
numa.c
8
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)
|
||||
|
|
Loading…
Reference in a new issue