diff options
| author | Dan Streetman <ddstreet@canonical.com> | 2019-04-16 14:46:24 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-05-20 18:40:02 -0400 |
| commit | 6ab79a20af3a7b3bf610ba9aebb446a9f0b05930 (patch) | |
| tree | 10488dfa57d35776cf0caf8d1be9d6ebfd0d590e | |
| parent | fe4970ad466dc14b919224d10179a8858130db43 (diff) | |
| download | qemu-6ab79a20af3a7b3bf610ba9aebb446a9f0b05930.zip qemu-6ab79a20af3a7b3bf610ba9aebb446a9f0b05930.tar.gz qemu-6ab79a20af3a7b3bf610ba9aebb446a9f0b05930.tar.bz2 | |
do not call vhost_net_cleanup() on running net from char user event
Buglink: https://launchpad.net/bugs/1823458
Currently, a user CHR_EVENT_CLOSED event will cause net_vhost_user_event()
to call vhost_user_cleanup(), which calls vhost_net_cleanup() for all
its queues. However, vhost_net_cleanup() must never be called like
this for fully-initialized nets; when other code later calls
vhost_net_stop() - such as from virtio_net_vhost_status() - it will try
to access the already-cleaned-up fields and fail with assertion errors
or segfaults.
The vhost_net_cleanup() will eventually be called from
qemu_cleanup_net_client().
Signed-off-by: Dan Streetman <ddstreet@canonical.com>
Message-Id: <20190416184624.15397-3-dan.streetman@canonical.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | net/vhost-user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c index 5a26a24..51921de 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -236,7 +236,6 @@ static void chr_closed_bh(void *opaque) s = DO_UPCAST(NetVhostUserState, nc, ncs[0]); qmp_set_link(name, false, &err); - vhost_user_stop(queues, ncs); qemu_chr_fe_set_handlers(&s->chr, NULL, NULL, net_vhost_user_event, NULL, opaque, NULL, true); |