add close callback for tty-based char device
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 tty0 of the host using the monitor command:
usb_add serial::/dev/tty0
and then removing the device with:
usb_del serial::/dev/tty0
qemu-char.c +0 -0
@@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr,
int cmd
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");
@@ -1187,6 +1201,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__ */
I have not seen response to this. If there are no objections please apply.
Thanks,
David Ahern
Quoted 56 lines · David S. 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 tty0 of the host using the monitor command:
usb_addserial::/dev/tty0and then removing the device with:
usb_delserial::/dev/tty0Signed-off-by David Ahern <[email protected]>qemu-char.c +0
-0@@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr,int cmd
return 0;}
qemu-char.c +15
-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" );@@ -1187,6 +1201,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__*/--
To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · David S. 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 tty0 of the host using the monitor command:
Quoted 8 lines
usb_addserial::/dev/tty0and then removing the device with:
usb_delserial::/dev/tty0Signed-off-by David Ahern<[email protected]>
This patch is whitespace damaged.
Quoted 7 lines
qemu-char.c +0
-0@@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr,int cmd
Right here and in other places.
Regards,
Anthony Liguori
Quoted 34 lines
return 0;}
qemu-char.c +15
-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" );@@ -1187,6 +1201,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__ */