aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2015-07-17 15:32:03 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:24 +0200
commit403652a78799f25e3c0d07326805cc1ffcce0f87 (patch)
treed36265da3ef837e8b59ba3e44c2adaecb5f300ee
parenta2edd216acb433c6c0ed03d3f5b7f6f5fa2f063a (diff)
downloadkernel_samsung_smdk4412-403652a78799f25e3c0d07326805cc1ffcce0f87.zip
kernel_samsung_smdk4412-403652a78799f25e3c0d07326805cc1ffcce0f87.tar.gz
kernel_samsung_smdk4412-403652a78799f25e3c0d07326805cc1ffcce0f87.tar.bz2
vhost: actually track log eventfd file
commit 7932c0bd7740f4cd2aa168d3ce0199e7af7d72d5 upstream. While reviewing vhost log code, I found out that log_file is never set. Note: I haven't tested the change (QEMU doesn't use LOG_FD yet). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/vhost/vhost.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index be32b1b..738707a 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -883,6 +883,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, unsigned long arg)
}
if (eventfp != d->log_file) {
filep = d->log_file;
+ d->log_file = eventfp;
ctx = d->log_ctx;
d->log_ctx = eventfp ?
eventfd_ctx_fileget(eventfp) : NULL;