mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guest agent: guest-file-open: refactoring

Browse Source 
Moved the code that sets non-blocking flag on fd into a separate function.

Signed-off-by: Simon Zolin <szolin@parallels.com>
Reviewed-by: Roman Kagan <rkagan@parallels.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
CC: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Simon Zolin 2015-02-06 20:59:54 +03:00 committed by Michael Roth
parent 459db780be
commit 85b6f6f535
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
qga/commands-posix.c
View File

@ -376,13 +376,33 @@ safe_open_or_create(const char *path, const char *mode, Error **errp)
return NULL; 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, int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode,
Error **errp) Error **errp)
{ {
FILE *fh; FILE *fh;
Error *local_err = NULL; Error *local_err = NULL;
int fd; int64_t handle;
int64_t ret = -1, handle;
if (!has_mode) { if (!has_mode) {
mode = "r"; 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 /* set fd non-blocking to avoid common use cases (like reading from a
* named pipe) from hanging the agent * named pipe) from hanging the agent
*/ */
fd = fileno(fh); if (guest_file_toggle_flags(fileno(fh), O_NONBLOCK, true, errp) < 0) {
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);
fclose(fh); fclose(fh);
return -1; return -1;
} }