diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-12 16:37:44 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-02-26 14:46:32 +0100 |
| commit | cccb7967bdf19f9d31e65d2d07d4d311e07545c4 (patch) | |
| tree | 1521f4b26e1615206e2e7ecbb29221099156a9dc /util/qemu-sockets.c | |
| parent | c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88 (diff) | |
| download | qemu-cccb7967bdf19f9d31e65d2d07d4d311e07545c4.tar.gz qemu-cccb7967bdf19f9d31e65d2d07d4d311e07545c4.tar.bz2 qemu-cccb7967bdf19f9d31e65d2d07d4d311e07545c4.zip | |
QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use
Return the Error object instead of reporting it with
qerror_report_err().
Change callers that assume the function can't fail to pass
&error_abort, so that should the assumption ever break, it'll break
noisily.
Turns out all callers outside its unit test assume that. We could
drop the Error ** argument, but that would make the interface less
regular, so don't.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'util/qemu-sockets.c')
| -rw-r--r-- | util/qemu-sockets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 61fc3c1364..7205dad820 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -580,8 +580,8 @@ static void inet_addr_to_opts(QemuOpts *opts, const InetSocketAddress *addr) bool ipv6 = addr->ipv6 || !addr->has_ipv6; if (!ipv4 || !ipv6) { - qemu_opt_set_bool(opts, "ipv4", ipv4); - qemu_opt_set_bool(opts, "ipv6", ipv6); + qemu_opt_set_bool(opts, "ipv4", ipv4, &error_abort); + qemu_opt_set_bool(opts, "ipv6", ipv6, &error_abort); } if (addr->has_to) { char to[20]; |