aboutsummaryrefslogtreecommitdiff
path: root/qga/main.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-05-02 13:26:33 +0200
committerLuiz Capitulino <lcapitulino@redhat.com>2014-05-09 09:11:30 -0400
commita903f40c314c57734ffd651786c953541cfc43a8 (patch)
treeea78f1fda3a04c5fa166c136b470d7ee65563fc4 /qga/main.c
parent64dfefed169465c5d0fc20fda7b06104406e390c (diff)
qga: Use return values instead of error_is_set(errp)
Using error_is_set(errp) to check whether a function call failed is fragile: it breaks when errp is null. ga_get_fd_handle() and guest_file_handle_add() don't return a useful value when they fail, but that's just stupid. Fix that, and check them instead. As far as I can tell, errp can't be null there, but this is more robust and more obviously correct. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'qga/main.c')
-rw-r--r--qga/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/qga/main.c b/qga/main.c
index 38219c9d77..8b927c9db7 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -910,6 +910,7 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp)
if (!write_persistent_state(&s->pstate, s->pstate_filepath)) {
error_setg(errp, "failed to commit persistent state to disk");
+ return -1;
}
return handle;