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 /tests/test-qemu-opts.c | |
| parent | 39101f2511f6adf1ae4380f8d729dba1213b9d7a (diff) | |
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 'tests/test-qemu-opts.c')
| -rw-r--r-- | tests/test-qemu-opts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 3fea96ab94..11cd1bdfa5 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -388,9 +388,9 @@ static void test_qemu_opts_reset(void) static void test_qemu_opts_set(void) { + Error *err = NULL; QemuOptsList *list; QemuOpts *opts; - int ret; const char *opt; list = qemu_find_opts("opts_list_01"); @@ -403,8 +403,8 @@ static void test_qemu_opts_set(void) g_assert(opts == NULL); /* implicitly create opts and set str3 value */ - ret = qemu_opts_set(list, NULL, "str3", "value"); - g_assert(ret == 0); + qemu_opts_set(list, NULL, "str3", "value", &err); + g_assert(!err); g_assert(!QTAILQ_EMPTY(&list->head)); /* get the just created opts */ |