Skip to contentSkip to conversation

add close callback for tty-based char device

PATCH Superseded David Ahern 2 participants 2 messages Feb 10, 2010

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 add close callback for tty-based char device

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

---
 qemu-char.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
qemu-char.c +15 -0
index 75dbf66..77edec9 100644
@@ -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__ */
Signature · 1 line
1.6.2.5
#1 lore raw
Quoted 25 lines · David Ahern

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

---
  qemu-char.c |   15 +++++++++++++++
  1 files changed, 15 insertions(+), 0 deletions(-)
qemu-char.c +0 -0
index 75dbf66..77edec9 100644
@@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr, int cmd, void *arg)
      return 0;
  }

qemu-char.c static int tty_serial_ioctl(CharDriverState *chr, int cmd, void *arg) · line 1184

Quoted 10 lines
qemu-char.c +7 -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