Re: [Qemu-devel] [PATCH] add close callback for tty-based char device
On 02/03/2010 10:18 AM, David S. 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 tty0 of the host using the monitor command: usb_add serial::/dev/tty0 and then removing the device with: usb_del serial::/dev/tty0 Signed-off-by: David Aherndaah...@cisco.com This patch is whitespace damaged. diff --git a/qemu-char.c b/qemu-char.c index 800ee6c..ecd84ec 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr, int cmd Right here and in other places. Regards, Anthony Liguori 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__ */
[Qemu-devel] [PATCH] 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 Signed-off-by: David Ahern daah...@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; + +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__ */ -- 1.6.2.5
Re: [Qemu-devel] [PATCH] add close callback for tty-based char device
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 Aherndaah...@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
[Qemu-devel] [PATCH] 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 Signed-off-by: David Ahern daah...@cisco.com diff --git a/qemu-char.c b/qemu-char.c index 800ee6c..ecd84ec 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -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__ */