Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-14 11:43:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-char: convert pty backend to data-driven creation

Browse Source 
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-09-29 15:23:42 +02:00
parent e79b80daa2
commit c2e75a432b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-char.c
View File

@ -1390,7 +1390,9 @@ static void pty_chr_close(struct CharDriverState *chr)
} }
static CharDriverState *qemu_chr_open_pty(const char *id, static CharDriverState *qemu_chr_open_pty(const char *id,
ChardevReturn *ret) ChardevBackend *backend,
ChardevReturn *ret,
Error **errp)
{ {
CharDriverState *chr; CharDriverState *chr;
PtyCharDriver *s; PtyCharDriver *s;
@ -1399,6 +1401,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
master_fd = qemu_openpty_raw(&slave_fd, pty_name); master_fd = qemu_openpty_raw(&slave_fd, pty_name);
if (master_fd < 0) { if (master_fd < 0) {
error_setg_errno(errp, errno, "Failed to create PTY");
return NULL; return NULL;
} }
@ -4287,11 +4290,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_UDP: case CHARDEV_BACKEND_KIND_UDP:
abort(); abort();
break; break;
#ifdef HAVE_CHARDEV_PTY
case CHARDEV_BACKEND_KIND_PTY: case CHARDEV_BACKEND_KIND_PTY:
chr = qemu_chr_open_pty(id, ret); abort();
break; break;
#endif
case CHARDEV_BACKEND_KIND_NULL: case CHARDEV_BACKEND_KIND_NULL:
chr = qemu_chr_open_null(); chr = qemu_chr_open_null();
break; break;
@ -4419,8 +4420,10 @@ static void register_types(void)
register_char_driver("parport", CHARDEV_BACKEND_KIND_PARALLEL, register_char_driver("parport", CHARDEV_BACKEND_KIND_PARALLEL,
qemu_chr_parse_parallel, qmp_chardev_open_parallel); qemu_chr_parse_parallel, qmp_chardev_open_parallel);
#endif #endif
#ifdef HAVE_CHARDEV_PTY
register_char_driver("pty", CHARDEV_BACKEND_KIND_PTY, NULL, register_char_driver("pty", CHARDEV_BACKEND_KIND_PTY, NULL,
NULL); qemu_chr_open_pty);
#endif
register_char_driver("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL, register_char_driver("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL,
NULL); NULL);
register_char_driver("pipe", CHARDEV_BACKEND_KIND_PIPE, register_char_driver("pipe", CHARDEV_BACKEND_KIND_PIPE,