Commit 12505396 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Michael Roth
Browse files

qga: drop hand-made guest_file_toggle_flags helper 



We'd better use generic qemu_set_nonblock directly.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarYuri Pudgorodskiy <yur@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 79cf9fad

qga/commands-posix.c

+2 −25
Original line number Diff line number Diff line
@@ -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) {