Commit 8835b9df authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-04-tag' into staging 



qemu-ga patch queue

* fix file handle cleanup on w32
* use non-blocking mode for file handles on w32 to avoid
  hangs on guest-file-read/guest-file-write to pipes

# gpg: Signature made Wed 04 Nov 2015 19:36:16 GMT using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"

* remotes/mdroth/tags/qga-pull-2015-11-04-tag:
  qga: set file descriptor in qmp_guest_file_open non-blocking on Win32
  qga: fixed CloseHandle in qmp_guest_file_open
  qga: drop hand-made guest_file_toggle_flags helper

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6c5f30ca fb687773

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) {

qga/commands-win32.c

+28 −1
Original line number Diff line number Diff line
@@ -128,6 +128,28 @@ static GuestFileHandle *guest_file_handle_find(int64_t id, Error **errp) 
    return NULL;

}



static void handle_set_nonblocking(HANDLE fh)

{

    DWORD file_type, pipe_state;

    file_type = GetFileType(fh);

    if (file_type != FILE_TYPE_PIPE) {

        return;

    }

    /* If file_type == FILE_TYPE_PIPE, according to MSDN

     * the specified file is socket or named pipe */

    if (!GetNamedPipeHandleState(fh, &pipe_state, NULL,

                                 NULL, NULL, NULL, 0)) {

        return;

    }

    /* The fd is named pipe fd */

    if (pipe_state & PIPE_NOWAIT) {

        return;

    }



    pipe_state |= PIPE_NOWAIT;

    SetNamedPipeHandleState(fh, &pipe_state, NULL, NULL);

}



int64_t qmp_guest_file_open(const char *path, bool has_mode,

                            const char *mode, Error **errp)

{
@@ -158,9 +180,14 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, 
        return -1;

    }



    /* set fd non-blocking to avoid common use cases (like reading from a

     * named pipe) from hanging the agent

     */

    handle_set_nonblocking(fh);



    fd = guest_file_handle_add(fh, errp);

    if (fd < 0) {

        CloseHandle(&fh);

        CloseHandle(fh);

        error_setg(errp, "failed to add handle to qmp handle table");

        return -1;

    }