Jelajahi Sumber

virtio-console: no need to remove char handlers explicitly

qdev is now equipped (thanks to the last commit) to disassociate
chardevs from the qdev devices on the devices going away.  So doing it
in the virtio-console driver is not necessary.

Since that was the only thing being done in the qdev exit method, drop
it entirely.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Amit Shah 13 tahun lalu
induk
melakukan
a10348c3ad
1 mengubah file dengan 0 tambahan dan 17 penghapusan
  1. 0 17
      hw/virtio-console.c

+ 0 - 17
hw/virtio-console.c

@@ -125,27 +125,11 @@ static int virtconsole_initfn(VirtIOSerialPort *port)
     return 0;
     return 0;
 }
 }
 
 
-static int virtconsole_exitfn(VirtIOSerialPort *port)
-{
-    VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
-
-    if (vcon->chr) {
-	/*
-	 * Instead of closing the chardev, free it so it can be used
-	 * for other purposes.
-	 */
-	qemu_chr_add_handlers(vcon->chr, NULL, NULL, NULL, NULL);
-    }
-
-    return 0;
-}
-
 static VirtIOSerialPortInfo virtconsole_info = {
 static VirtIOSerialPortInfo virtconsole_info = {
     .qdev.name     = "virtconsole",
     .qdev.name     = "virtconsole",
     .qdev.size     = sizeof(VirtConsole),
     .qdev.size     = sizeof(VirtConsole),
     .is_console    = true,
     .is_console    = true,
     .init          = virtconsole_initfn,
     .init          = virtconsole_initfn,
-    .exit          = virtconsole_exitfn,
     .have_data     = flush_buf,
     .have_data     = flush_buf,
     .guest_open    = guest_open,
     .guest_open    = guest_open,
     .guest_close   = guest_close,
     .guest_close   = guest_close,
@@ -165,7 +149,6 @@ static VirtIOSerialPortInfo virtserialport_info = {
     .qdev.name     = "virtserialport",
     .qdev.name     = "virtserialport",
     .qdev.size     = sizeof(VirtConsole),
     .qdev.size     = sizeof(VirtConsole),
     .init          = virtconsole_initfn,
     .init          = virtconsole_initfn,
-    .exit          = virtconsole_exitfn,
     .have_data     = flush_buf,
     .have_data     = flush_buf,
     .guest_open    = guest_open,
     .guest_open    = guest_open,
     .guest_close   = guest_close,
     .guest_close   = guest_close,