diff options
author | Markus Armbruster <armbru@redhat.com> | 2015-02-12 17:07:34 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-02-26 14:47:49 +0100 |
commit | 79087c782e1549a6f9c8303aafc0b74f4e637756 (patch) | |
tree | 32261ec7ed405e6118a7e618b0e9f0cf8d248e3a /net | |
parent | 39101f2511f6adf1ae4380f8d729dba1213b9d7a (diff) | |
download | qemu-79087c782e1549a6f9c8303aafc0b74f4e637756.zip qemu-79087c782e1549a6f9c8303aafc0b74f4e637756.tar.gz qemu-79087c782e1549a6f9c8303aafc0b74f4e637756.tar.bz2 |
QemuOpts: Convert qemu_opts_set() 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 'net')
-rw-r--r-- | net/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1296,9 +1296,9 @@ int net_init_clients(void) if (default_net) { /* if no clients, we use a default config */ - qemu_opts_set(net, NULL, "type", "nic"); + qemu_opts_set(net, NULL, "type", "nic", &error_abort); #ifdef CONFIG_SLIRP - qemu_opts_set(net, NULL, "type", "user"); + qemu_opts_set(net, NULL, "type", "user", &error_abort); #endif } |