Commit 7177876f authored by Amit Shah's avatar Amit Shah Committed by Rusty Russell

virtio: console: Add ability to remove module

Add the ability to remove the virtio_console module.

This aids debugging.
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent a9cdd485
...@@ -1448,6 +1448,36 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) ...@@ -1448,6 +1448,36 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
return err; return err;
} }
static void virtcons_remove(struct virtio_device *vdev)
{
struct ports_device *portdev;
struct port *port, *port2;
struct port_buffer *buf;
unsigned int len;
portdev = vdev->priv;
cancel_work_sync(&portdev->control_work);
cancel_work_sync(&portdev->config_work);
list_for_each_entry_safe(port, port2, &portdev->ports, list)
remove_port(port);
unregister_chrdev(portdev->chr_major, "virtio-portsdev");
while ((buf = portdev->c_ivq->vq_ops->get_buf(portdev->c_ivq, &len)))
free_buf(buf);
while ((buf = portdev->c_ivq->vq_ops->detach_unused_buf(portdev->c_ivq)))
free_buf(buf);
vdev->config->del_vqs(vdev);
kfree(portdev->in_vqs);
kfree(portdev->out_vqs);
kfree(portdev);
}
static struct virtio_device_id id_table[] = { static struct virtio_device_id id_table[] = {
{ VIRTIO_ID_CONSOLE, VIRTIO_DEV_ANY_ID }, { VIRTIO_ID_CONSOLE, VIRTIO_DEV_ANY_ID },
{ 0 }, { 0 },
...@@ -1465,6 +1495,7 @@ static struct virtio_driver virtio_console = { ...@@ -1465,6 +1495,7 @@ static struct virtio_driver virtio_console = {
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.id_table = id_table, .id_table = id_table,
.probe = virtcons_probe, .probe = virtcons_probe,
.remove = virtcons_remove,
.config_changed = config_intr, .config_changed = config_intr,
}; };
...@@ -1488,7 +1519,17 @@ static int __init init(void) ...@@ -1488,7 +1519,17 @@ static int __init init(void)
return register_virtio_driver(&virtio_console); return register_virtio_driver(&virtio_console);
} }
static void __exit fini(void)
{
unregister_virtio_driver(&virtio_console);
class_destroy(pdrvdata.class);
if (pdrvdata.debugfs_dir)
debugfs_remove_recursive(pdrvdata.debugfs_dir);
}
module_init(init); module_init(init);
module_exit(fini);
MODULE_DEVICE_TABLE(virtio, id_table); MODULE_DEVICE_TABLE(virtio, id_table);
MODULE_DESCRIPTION("Virtio console driver"); MODULE_DESCRIPTION("Virtio console driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment