Patchwork add close callback for tty-based char device

login
register
mail settings
Submitter David S. Ahern
Date Feb. 10, 2010, 10 p.m.
Message ID <1265839249-12068-1-git-send-email-daahern@cisco.com>
Download mbox | patch
Permalink /patch/45060/
State New
Headers show

Comments

David S. Ahern - Feb. 10, 2010, 10 p.m.
Add a tty close callback. Right now if a guest device that is connected
to a tty-based chardev in the host is removed, the tty is not closed.
With this patch it is closed. 

Example use case is connecting an emulated USB serial cable in the guest
to ttyS0 of the host using the monitor command:

usb_add serial::/dev/ttyS0

and then removing the device with:

usb_del serial::/dev/ttyS0

Signed-off-by: David Ahern <daahern@cisco.com>
---
 qemu-char.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
Anthony Liguori - Feb. 10, 2010, 10:51 p.m.
On 02/10/2010 04:00 PM, David Ahern wrote:
> Add a tty close callback. Right now if a guest device that is connected
> to a tty-based chardev in the host is removed, the tty is not closed.
> With this patch it is closed.
>
> Example use case is connecting an emulated USB serial cable in the guest
> to ttyS0 of the host using the monitor command:
>
> usb_add serial::/dev/ttyS0
>
> and then removing the device with:
>
> usb_del serial::/dev/ttyS0
>
> Signed-off-by: David Ahern<daahern@cisco.com>
> ---
>   qemu-char.c |   15 +++++++++++++++
>   1 files changed, 15 insertions(+), 0 deletions(-)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index 75dbf66..77edec9 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr, int cmd, void *arg)
>       return 0;
>   }
>
> +static void qemu_chr_close_tty(CharDriverState *chr)
> +{
> +    FDCharDriver *s = chr->opaque;
> +    int fd = -1;
> +
> +    if (s)
> +        fd = s->fd_in;
>
>    

You've got trailing spaces and this doesn't adhere to CODING_STYLE 
(needs curly braces around the if clause).

Regards,

Anthony Liguori

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 75dbf66..77edec9 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1173,6 +1173,20 @@  static int tty_serial_ioctl(CharDriverState *chr, int cmd, void *arg)
     return 0;
 }
 
+static void qemu_chr_close_tty(CharDriverState *chr)
+{
+    FDCharDriver *s = chr->opaque;
+    int fd = -1;
+
+    if (s)
+        fd = s->fd_in;
+
+    fd_chr_close(chr);
+
+    if (fd >= 0) 
+        close(fd);
+}
+
 static CharDriverState *qemu_chr_open_tty(QemuOpts *opts)
 {
     const char *filename = qemu_opt_get(opts, "path");
@@ -1190,6 +1204,7 @@  static CharDriverState *qemu_chr_open_tty(QemuOpts *opts)
         return NULL;
     }
     chr->chr_ioctl = tty_serial_ioctl;
+    chr->chr_close = qemu_chr_close_tty;
     return chr;
 }
 #else  /* ! __linux__ && ! __sun__ */