falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Ross Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Ross Lagerwall 2017-11-01 14:25:26 +00:00 committed by Daniel P. Berrangé
parent a2565df12c
commit b8f244b13c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
io/channel-file.c
View File

@ -50,7 +50,7 @@ qio_channel_file_new_path(const char *path,
ioc = QIO_CHANNEL_FILE(object_new(TYPE_QIO_CHANNEL_FILE)); 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) { if (ioc->fd < 0) {
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
@ -74,7 +74,7 @@ static void qio_channel_file_finalize(Object *obj)
{ {
QIOChannelFile *ioc = QIO_CHANNEL_FILE(obj); QIOChannelFile *ioc = QIO_CHANNEL_FILE(obj);
if (ioc->fd != -1) { if (ioc->fd != -1) {
close(ioc->fd); qemu_close(ioc->fd);
ioc->fd = -1; ioc->fd = -1;
} }
} }
@ -173,7 +173,7 @@ static int qio_channel_file_close(QIOChannel *ioc,
{ {
QIOChannelFile *fioc = QIO_CHANNEL_FILE(ioc); QIOChannelFile *fioc = QIO_CHANNEL_FILE(ioc);
if (close(fioc->fd) < 0) { if (qemu_close(fioc->fd) < 0) {
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
"Unable to close file"); "Unable to close file");
return -1; return -1;