aboutsummaryrefslogtreecommitdiff
path: root/qga/commands-posix.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2015-10-28 18:13:55 +0300
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-11-04 07:37:56 -0600
commit125053965b05b31427ff5c75dc3b87acaa8d0505 (patch)
tree80bca4b8267f4e531a32d071da50511333a06135 /qga/commands-posix.c
parent79cf9fad341e6e7bd6b55395b71d5c5727d7f5b0 (diff)
downloadqemu-125053965b05b31427ff5c75dc3b87acaa8d0505.zip
qemu-125053965b05b31427ff5c75dc3b87acaa8d0505.tar.gz
qemu-125053965b05b31427ff5c75dc3b87acaa8d0505.tar.bz2
qga: drop hand-made guest_file_toggle_flags helper
We'd better use generic qemu_set_nonblock directly. Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Yuri Pudgorodskiy <yur@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> CC: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga/commands-posix.c')
-rw-r--r--qga/commands-posix.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 67a173a..0ebd473 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -28,6 +28,7 @@
#include "qapi/qmp/qerror.h"
#include "qemu/queue.h"
#include "qemu/host-utils.h"
+#include "qemu/sockets.h"
#ifndef CONFIG_HAS_ENVIRON
#ifdef __APPLE__
@@ -385,27 +386,6 @@ safe_open_or_create(const char *path, const char *mode, Error **errp)
return NULL;
}
-static int guest_file_toggle_flags(int fd, int flags, bool set, Error **err)
-{
- int ret, old_flags;
-
- old_flags = fcntl(fd, F_GETFL);
- if (old_flags == -1) {
- error_setg_errno(err, errno, QERR_QGA_COMMAND_FAILED,
- "failed to fetch filehandle flags");
- return -1;
- }
-
- ret = fcntl(fd, F_SETFL, set ? (old_flags | flags) : (old_flags & ~flags));
- if (ret == -1) {
- error_setg_errno(err, errno, QERR_QGA_COMMAND_FAILED,
- "failed to set filehandle flags");
- return -1;
- }
-
- return ret;
-}
-
int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode,
Error **errp)
{
@@ -426,10 +406,7 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode,
/* set fd non-blocking to avoid common use cases (like reading from a
* named pipe) from hanging the agent
*/
- if (guest_file_toggle_flags(fileno(fh), O_NONBLOCK, true, errp) < 0) {
- fclose(fh);
- return -1;
- }
+ qemu_set_nonblock(fileno(fh));
handle = guest_file_handle_add(fh, errp);
if (handle < 0) {