[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5079] Enable pty/tty functions for BSDs too (initial patch
From: |
Blue Swirl |
Subject: |
[Qemu-devel] [5079] Enable pty/tty functions for BSDs too (initial patch from Xen) |
Date: |
Sun, 24 Aug 2008 10:34:20 +0000 |
Revision: 5079
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5079
Author: blueswir1
Date: 2008-08-24 10:34:20 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Enable pty/tty functions for BSDs too (initial patch from Xen)
Modified Paths:
--------------
trunk/vl.c
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2008-08-24 10:30:33 UTC (rev 5078)
+++ trunk/vl.c 2008-08-24 10:34:20 UTC (rev 5079)
@@ -109,6 +109,10 @@
#include "libslirp.h"
#endif
+#if defined(__OpenBSD__)
+#include <util.h>
+#endif
+
#if defined(CONFIG_VDE)
#include <libvdeplug.h>
#endif
@@ -2465,7 +2469,8 @@
}
#endif
-#if defined(__linux__) || defined(__sun__)
+#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
+ || defined(__NetBSD__) || defined(__OpenBSD__)
typedef struct {
int fd;
@@ -2593,6 +2598,13 @@
PtyCharDriver *s;
struct termios tty;
int slave_fd;
+#if defined(__OpenBSD__)
+ char pty_name[PATH_MAX];
+#define q_ptsname(x) pty_name
+#else
+ char *pty_name = NULL;
+#define q_ptsname(x) ptsname(x)
+#endif
chr = qemu_mallocz(sizeof(CharDriverState));
if (!chr)
@@ -2603,7 +2615,7 @@
return NULL;
}
- if (openpty(&s->fd, &slave_fd, NULL, NULL, NULL) < 0) {
+ if (openpty(&s->fd, &slave_fd, pty_name, NULL, NULL) < 0) {
return NULL;
}
@@ -2612,7 +2624,7 @@
tcsetattr(slave_fd, TCSAFLUSH, &tty);
close(slave_fd);
- fprintf(stderr, "char device redirected to %s\n", ptsname(s->fd));
+ fprintf(stderr, "char device redirected to %s\n", q_ptsname(s->fd));
chr->opaque = s;
chr->chr_write = pty_chr_write;
@@ -3819,7 +3831,8 @@
return qemu_chr_open_pp(filename);
} else
#endif
-#if defined(__linux__) || defined(__sun__)
+#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
+ || defined(__NetBSD__) || defined(__OpenBSD__)
if (strstart(filename, "/dev/", NULL)) {
return qemu_chr_open_tty(filename);
} else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5079] Enable pty/tty functions for BSDs too (initial patch from Xen),
Blue Swirl <=