github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 21:47:22 +00:00
Code Issues Projects Releases Wiki Activity

DM: release mevent when doing virtual device deinit

Browse Source 
When doing warm reboot, the mevent module will not be deinitialized.
We need to delete all mevent registered while deinit virutal device.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Yin Fengwei 2018-04-13 16:57:55 +08:00 committed by Jack Ren
parent e65b98bf36
commit 097aee76bf
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devicemodel/hw/pci/virtio/virtio_console.c
View File

@ -766,6 +766,13 @@ virtio_console_close_all(struct virtio_console *console)
be = (struct virtio_console_backend *)port->arg; be = (struct virtio_console_backend *)port->arg;
if (be) { if (be) {
if (be->evp) {
if (be->fd != STDIN_FILENO)
mevent_delete_close(be->evp);
else
mevent_delete(be->evp);
}
virtio_console_close_backend(be); virtio_console_close_backend(be);
free(be); free(be);
} }

3
devicemodel/hw/pci/virtio/virtio_net.c
View File

@ -1093,6 +1093,9 @@ virtio_net_deinit(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
} else } else
fprintf(stderr, "net->tapfd is -1!\n"); fprintf(stderr, "net->tapfd is -1!\n");
if (net->mevp != NULL)
mevent_delete(net->mevp);
free(net); free(net);
DPRINTF(("%s: done\n", __func__)); DPRINTF(("%s: done\n", __func__));