diff options
author | Markus Armbruster <armbru@redhat.com> | 2014-05-02 13:26:33 +0200 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-05-09 09:11:30 -0400 |
commit | a903f40c314c57734ffd651786c953541cfc43a8 (patch) | |
tree | ea78f1fda3a04c5fa166c136b470d7ee65563fc4 | |
parent | 64dfefed169465c5d0fc20fda7b06104406e390c (diff) | |
download | qemu-a903f40c314c57734ffd651786c953541cfc43a8.zip qemu-a903f40c314c57734ffd651786c953541cfc43a8.tar.gz qemu-a903f40c314c57734ffd651786c953541cfc43a8.tar.bz2 |
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>
-rw-r--r-- | qga/commands-posix.c | 6 | ||||
-rw-r--r-- | qga/main.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index f6af7d1..6af974f 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -223,8 +223,8 @@ static int64_t guest_file_handle_add(FILE *fh, Error **errp) int64_t handle; handle = ga_get_fd_handle(ga_state, errp); - if (error_is_set(errp)) { - return 0; + if (handle < 0) { + return -1; } gfh = g_malloc0(sizeof(GuestFileHandle)); @@ -407,7 +407,7 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, } handle = guest_file_handle_add(fh, errp); - if (error_is_set(errp)) { + if (handle < 0) { fclose(fh); return -1; } @@ -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; |