Commit b8f244b1 authored by Ross Lagerwall's avatar Ross Lagerwall Committed by Daniel P. Berrangé
Browse files

io: Add /dev/fdset/ support to QIOChannelFile 



Add /dev/fdset/ support to QIOChannelFile by calling qemu_open() instead
of open() and qemu_close() instead of close(). There is a subtle
semantic change since qemu_open() automatically sets O_CLOEXEC, but this
doesn't affect any of the users of the function.

Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent a2565df1

io/channel-file.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ qio_channel_file_new_path(const char *path, 


    ioc = QIO_CHANNEL_FILE(object_new(TYPE_QIO_CHANNEL_FILE));



    ioc->fd = open(path, flags, mode);

    ioc->fd = qemu_open(path, flags, mode);

    if (ioc->fd < 0) {

        object_unref(OBJECT(ioc));

        error_setg_errno(errp, errno,
@@ -74,7 +74,7 @@ static void qio_channel_file_finalize(Object *obj) 
{

    QIOChannelFile *ioc = QIO_CHANNEL_FILE(obj);

    if (ioc->fd != -1) {

        close(ioc->fd);

        qemu_close(ioc->fd);

        ioc->fd = -1;

    }

}
@@ -173,7 +173,7 @@ static int qio_channel_file_close(QIOChannel *ioc, 
{

    QIOChannelFile *fioc = QIO_CHANNEL_FILE(ioc);



    if (close(fioc->fd) < 0) {

    if (qemu_close(fioc->fd) < 0) {

        error_setg_errno(errp, errno,

                         "Unable to close file");

        return -1;