[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] guest agent: guest-file-open: refactoring
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 03/10] guest agent: guest-file-open: refactoring |
Date: |
Tue, 17 Feb 2015 16:40:19 -0600 |
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>
Reviewed-by: Roman Kagan <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Michael Roth <address@hidden>
CC: Eric Blake <address@hidden>
Signed-off-by: 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 57409d0..ed527a3 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, int 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] [PULL v2 00/10] Fixes and new commands for QEMU Guest Agent, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 09/10] qga: add memory block command that unsupported, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 02/10] utils: drop strtok_r from envlist_parse, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 01/10] qga: add guest-set-user-password command, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 10/10] qemu-ga-win: Fail loudly on bare 'set-time', Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 05/10] qga: introduce three guest memory block commmands with stubs, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 04/10] qga: implement file commands for Windows guest, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 06/10] qga: implement qmp_guest_get_memory_blocks() for Linux with sysfs, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 08/10] qga: implement qmp_guest_get_memory_block_info() for Linux with sysfs, Michael Roth, 2015/02/17
- [Qemu-devel] [PATCH 03/10] guest agent: guest-file-open: refactoring,
Michael Roth <=
- [Qemu-devel] [PATCH 07/10] qga: implement qmp_guest_set_memory_blocks() for Linux with sysfs, Michael Roth, 2015/02/17
- Re: [Qemu-devel] [PULL v2 00/10] Fixes and new commands for QEMU Guest Agent, Peter Maydell, 2015/02/25