summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2013-06-05 18:44:54 +0400
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-06-14 18:58:27 -0500
commit0817fa97673acc71994a65e73449b632c069c22b (patch)
tree062cab6849e28445a8b15fc5f16c40217627f441 /ui
parent58101748657072985a6a0e23f426be5426fd76f7 (diff)
downloadqemu-0817fa97673acc71994a65e73449b632c069c22b.tar.gz
qemu-0817fa97673acc71994a65e73449b632c069c22b.tar.bz2
qemu-0817fa97673acc71994a65e73449b632c069c22b.zip
create qemu_openpty_raw() helper function and move it to a separate file
In two places qemu uses openpty() which is very system-dependent, and in both places the pty is switched to raw mode as well. Make a wrapper function which does both steps, and move all the system-dependent complexity into a separate file, together with static/local implementations of openpty() and cfmakeraw() from qemu-char.c. It is in a separate file, not part of oslib-posix.c, because openpty() often resides in -lutil which is not linked to every program qemu builds. This change removes #including of <pty.h>, <termios.h> and other rather specific system headers out of qemu-common.h, which isn't a place for such specific headers really. This version has been verified to build correctly on Linux, OpenBSD, FreeBSD and OpenIndiana. On the latter it lets qemu to be built with gtk gui which were not possible there due to missing openpty() and cfmakeraw(). Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Tested-by: Andreas Färber <andreas.faerber@web.de> (cherry picked from commit 4efeabbbe8441cc327052304976c7b9b86309d72) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index 82cf85200a..a788cc08ff 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1158,8 +1158,7 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
GIOChannel *chan;
GtkWidget *scrolled_window;
GtkAdjustment *vadjustment;
- int master_fd, slave_fd, ret;
- struct termios tty;
+ int master_fd, slave_fd;
snprintf(buffer, sizeof(buffer), "vc%d", index);
snprintf(path, sizeof(path), "<QEMU>/View/VC%d", index);
@@ -1179,13 +1178,8 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
vc->terminal = vte_terminal_new();
- ret = openpty(&master_fd, &slave_fd, NULL, NULL, NULL);
- g_assert(ret != -1);
-
- /* Set raw attributes on the pty. */
- tcgetattr(slave_fd, &tty);
- cfmakeraw(&tty);
- tcsetattr(slave_fd, TCSAFLUSH, &tty);
+ master_fd = qemu_openpty_raw(&slave_fd, NULL);
+ g_assert(master_fd != -1);
#if VTE_CHECK_VERSION(0, 26, 0)
pty = vte_pty_new_foreign(master_fd, NULL);