Skip to contentSkip to conversation

add close callback for tty-based char device

PATCH Applied David Ahern 2 participants 3 messages Feb 11, 2010 – Feb 22, 2010

lore
Share & tools
lore
#0 lore raw

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

v1 -> v2 coding style changes

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 |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
qemu-char.c +17 -0
index 75dbf66..4169492 100644
@@ -1173,6 +1173,22 @@ 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 +1206,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

I have not seen a follow up. I believe the comments regarding whitespace and coding style have been addressed.

Thanks,
David Ahern

Quoted 55 lines · David Ahern

v1 -> v2 coding style changes

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 |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
qemu-char.c +17 -0
index 75dbf66..4169492 100644
@@ -1173,6 +1173,22 @@ 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 +1206,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__ */
#2 lore raw
In reply to David Ahern
Quoted 9 lines · David Ahern

v1 -> v2 coding style changes

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:

Quoted 8 lines

usb_add serial::/dev/ttyS0

and then removing the device with:

usb_del serial::/dev/ttyS0

Applied. Thanks.

Regards,

Anthony Liguori

Quoted 40 lines
---
  qemu-char.c |   17 +++++++++++++++++
  1 files changed, 17 insertions(+), 0 deletions(-)
qemu-char.c +17 -0
index 75dbf66..4169492 100644
@@ -1173,6 +1173,22 @@ 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 +1206,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__ */