diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-09 10:05:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-09 10:05:29 +0100 |
| commit | b781a60b1054e06de6733b75dd1489afff9c3276 (patch) | |
| tree | 17e34ae3ddbf174a94e9e6b94988ee5e43724cf5 /numa.c | |
| parent | ee09f84e6bf5383a23c9624115c26b72aa1e076c (diff) | |
| parent | 8190483196148f765c65785876f7b893d64b6cdd (diff) | |
| download | focaccia-qemu-b781a60b1054e06de6733b75dd1489afff9c3276.tar.gz focaccia-qemu-b781a60b1054e06de6733b75dd1489afff9c3276.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-06-09' into staging
Error reporting patches # gpg: Signature made Tue Jun 9 06:42:15 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" * remotes/armbru/tags/pull-error-2015-06-09: vhost-user: Improve -netdev/netdev_add/-net/... error reporting QemuOpts: Convert qemu_opt_foreach() to Error QemuOpts: Drop qemu_opt_foreach() parameter abort_on_failure blkdebug: Simplify passing of Error through qemu_opts_foreach() QemuOpts: Convert qemu_opts_foreach() to Error QemuOpts: Drop qemu_opts_foreach() parameter abort_on_failure vl: Fail right after first bad -object vl: Print -device help at most once vl: Report failure to sandbox at most once Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'numa.c')
| -rw-r--r-- | numa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/numa.c b/numa.c index c975fb2682..d227ccc23b 100644 --- a/numa.c +++ b/numa.c @@ -125,7 +125,7 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp) max_numa_nodeid = MAX(max_numa_nodeid, nodenr + 1); } -static int parse_numa(QemuOpts *opts, void *opaque) +static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) { NumaOptions *object = NULL; Error *err = NULL; @@ -216,8 +216,7 @@ void parse_numa_opts(MachineClass *mc) { int i; - if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, - NULL, 1) != 0) { + if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, NULL, NULL)) { exit(1); } |