]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vhost: actually track log eventfd file
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Fri, 17 Jul 2015 13:32:03 +0000 (15:32 +0200)
committerZefan Li <lizefan@huawei.com>
Mon, 21 Mar 2016 01:17:49 +0000 (09:17 +0800)
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: Zefan Li <lizefan@huawei.com>
drivers/vhost/vhost.c

index a50cb9c28f7da527bb8b1b2402d14efb63548fc6..8b2bac4c1c401cb479b871457def8b2b36d7b192 100644 (file)
@@ -884,6 +884,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;