[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] io: Add /dev/fdset/ support to QIOChannelFile
From: |
Daniel P . Berrangé |
Subject: |
[Qemu-devel] [PULL 5/7] io: Add /dev/fdset/ support to QIOChannelFile |
Date: |
Thu, 15 Feb 2018 17:50:42 +0000 |
From: Ross Lagerwall <address@hidden>
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 <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/channel-file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/io/channel-file.c b/io/channel-file.c
index 1f2f710bf9..db948abc3e 100644
--- a/io/channel-file.c
+++ b/io/channel-file.c
@@ -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;
--
2.14.3
- [Qemu-devel] [PULL 0/7] Qio next patches, Daniel P . Berrangé, 2018/02/15
- [Qemu-devel] [PULL 1/7] io: fix QIONetListener memory leak, Daniel P . Berrangé, 2018/02/15
- [Qemu-devel] [PULL 5/7] io: Add /dev/fdset/ support to QIOChannelFile,
Daniel P . Berrangé <=
- [Qemu-devel] [PULL 6/7] io/channel-command: Do not kill the child process after closing the pipe, Daniel P . Berrangé, 2018/02/15
- [Qemu-devel] [PULL 2/7] io/channel-websock: handle continuous reads without any data, Daniel P . Berrangé, 2018/02/15
- [Qemu-devel] [PULL 4/7] io: Don't call close multiple times in QIOChannelFile, Daniel P . Berrangé, 2018/02/15
- [Qemu-devel] [PULL 3/7] io: Fix QIOChannelFile when creating and opening read-write, Daniel P . Berrangé, 2018/02/15
- [Qemu-devel] [PULL 7/7] allow to build with older sed, Daniel P . Berrangé, 2018/02/15
- Re: [Qemu-devel] [PULL 0/7] Qio next patches, Peter Maydell, 2018/02/15
- Re: [Qemu-devel] [PULL 0/7] Qio next patches, Peter Maydell, 2018/02/16