From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Jason Wang <jasowang@redhat.com>, Cindy Lu <lulu@redhat.com>
Subject: [PULL 23/38] vhost-vdpa: Add qemu_close in vhost_vdpa_cleanup
Date: Tue, 3 Nov 2020 09:35:00 -0500 [thread overview]
Message-ID: <20201103142306.71782-24-mst@redhat.com> (raw)
In-Reply-To: <20201103142306.71782-1-mst@redhat.com>
From: Cindy Lu <lulu@redhat.com>
fix the bug that fd will still open after the cleanup
Signed-off-by: Cindy Lu <lulu@redhat.com>
Message-Id: <20201016030909.9522-1-lulu@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
net/vhost-vdpa.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 99c476db8c..fe659ec9e2 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -145,6 +145,10 @@ static void vhost_vdpa_cleanup(NetClientState *nc)
g_free(s->vhost_net);
s->vhost_net = NULL;
}
+ if (s->vhost_vdpa.device_fd >= 0) {
+ qemu_close(s->vhost_vdpa.device_fd);
+ s->vhost_vdpa.device_fd = -1;
+ }
}
static bool vhost_vdpa_has_vnet_hdr(NetClientState *nc)
--
MST
next prev parent reply other threads:[~2020-11-03 15:03 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 14:33 [PULL 00/38] pc,pci,vhost,virtio: fixes Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 01/38] pc: comment style fixup Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 02/38] virtio-mem: Make sure "addr" is always multiples of the block size Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 03/38] virtio-mem: Make sure "usable_region_size" " Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 04/38] virtio-mem: Probe THP size to determine default " Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 05/38] memory-device: Support big alignment requirements Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 06/38] memory-device: Add get_min_alignment() callback Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 07/38] virito-mem: Implement get_min_alignment() Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 08/38] hw/acpi : Don't use '#' flag of printf format Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 09/38] hw/acpi : add space before the open parenthesis '(' Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 10/38] hw/acpi : add spaces around operator Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 11/38] hw/virtio/vhost-backend: Fix Coverity CID 1432871 Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 12/38] hw/smbios: Fix leaked fd in save_opt_one() error path Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 13/38] virtio-iommu: Fix virtio_iommu_mr() Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 14/38] virtio-iommu: Store memory region in endpoint struct Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 15/38] virtio-iommu: Add memory notifiers for map/unmap Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 16/38] virtio-iommu: Call memory notifiers in attach/detach Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 17/38] virtio-iommu: Add replay() memory region callback Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 18/38] virtio-iommu: Add notify_flag_changed() " Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 19/38] memory: Add interface to set iommu page size mask Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 20/38] vfio: Set IOMMU page size as per host supported page size Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 21/38] virtio-iommu: Set supported page size mask Michael S. Tsirkin
2020-11-03 14:34 ` [PULL 22/38] vfio: Don't issue full 2^64 unmap Michael S. Tsirkin
2020-11-03 14:35 ` Michael S. Tsirkin [this message]
2020-11-03 14:35 ` [PULL 24/38] net: Add vhost-vdpa in show_netdevs() Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 25/38] Revert "vhost-blk: set features before setting inflight feature" Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 26/38] vhost-blk: set features before setting inflight feature Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 27/38] libvhost-user: follow QEMU comment style Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 28/38] configure: introduce --enable-vhost-user-blk-server Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 29/38] block/export: make vhost-user-blk config space little-endian Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 30/38] block/export: fix vhost-user-blk get_config() information leak Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 31/38] contrib/vhost-user-blk: fix " Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 32/38] test: new qTest case to test the vhost-user-blk-server Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 33/38] tests/qtest: add multi-queue test case to vhost-user-blk-test Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 34/38] libqtest: add qtest_socket_server() Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 35/38] vhost-user-blk-test: rename destroy_drive() to destroy_file() Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 36/38] vhost-user-blk-test: close fork child file descriptors Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 37/38] vhost-user-blk-test: drop unused return value Michael S. Tsirkin
2020-11-03 14:35 ` [PULL 38/38] vhost-user-blk-test: fix races by using fd passing Michael S. Tsirkin
2020-11-03 15:59 ` [PULL 00/38] pc,pci,vhost,virtio: fixes Peter Maydell
2020-11-03 21:40 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201103142306.71782-24-mst@redhat.com \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=lulu@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).