[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] guest agent: guest-file-open: refactoring
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 3/8] guest agent: guest-file-open: refactoring |
Date: |
Wed, 31 Dec 2014 16:06:49 +0300 |
From: Simon Zolin <address@hidden>
Moved the code that sets non-blocking flag on fd into a separate function.
Signed-off-by: Simon Zolin <address@hidden>
Acked-by: Roman Kagan <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Michael Roth <address@hidden>
---
qga/commands-posix.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index f6f3e3c..fd746db 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -376,13 +376,33 @@ safe_open_or_create(const char *path, const char *mode,
Error **errp)
return NULL;
}
+static int guest_file_toggle_flags(int fd, long flags, bool set, Error **err)
+{
+ int ret, old_flags;
+
+ old_flags = fcntl(fd, F_GETFL);
+ if (old_flags == -1) {
+ error_set_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_set_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)
{
FILE *fh;
Error *local_err = NULL;
- int fd;
- int64_t ret = -1, handle;
+ int64_t handle;
if (!has_mode) {
mode = "r";
@@ -397,12 +417,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
*/
- fd = fileno(fh);
- ret = fcntl(fd, F_GETFL);
- ret = fcntl(fd, F_SETFL, ret | O_NONBLOCK);
- if (ret == -1) {
- error_setg_errno(errp, errno, "failed to make file '%s' non-blocking",
- path);
+ if (guest_file_toggle_flags(fileno(fh), O_NONBLOCK, true, errp) < 0) {
fclose(fh);
return -1;
}
--
1.9.1
- [Qemu-devel] [PATCH v2 0/8] qemu: guest agent: implement guest-exec command for Linux, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 8/8] guest agent: add guest-exec and guest-exec-status interfaces on Windows, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 3/8] guest agent: guest-file-open: refactoring,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 6/8] guest agent: ignore SIGPIPE signal, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 7/8] guest agent: add guest-pipe-open command on Windows, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 2/8] qga: implement file commands for Windows guest, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 1/8] qga: fixed warning in qemu-ga.exe for mingw >= 4.9.1, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 5/8] guest agent: add guest-exec and guest-exec-status interfaces, Denis V. Lunev, 2014/12/31
- [Qemu-devel] [PATCH 4/8] guest agent: add guest-pipe-open, Denis V. Lunev, 2014/12/31