mirror of https://github.com/xqemu/xqemu.git
Enable pty/tty functions for BSDs too (initial patch from Xen)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5079 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
a10ea30b11
commit
9892fbfb24
21
vl.c
21
vl.c
|
@ -109,6 +109,10 @@ int inet_aton(const char *cp, struct in_addr *ia);
|
||||||
#include "libslirp.h"
|
#include "libslirp.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__OpenBSD__)
|
||||||
|
#include <util.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_VDE)
|
#if defined(CONFIG_VDE)
|
||||||
#include <libvdeplug.h>
|
#include <libvdeplug.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -2465,7 +2469,8 @@ void cfmakeraw (struct termios *termios_p)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__linux__) || defined(__sun__)
|
#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
|
||||||
|
|| defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int fd;
|
int fd;
|
||||||
|
@ -2593,6 +2598,13 @@ static CharDriverState *qemu_chr_open_pty(void)
|
||||||
PtyCharDriver *s;
|
PtyCharDriver *s;
|
||||||
struct termios tty;
|
struct termios tty;
|
||||||
int slave_fd;
|
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));
|
chr = qemu_mallocz(sizeof(CharDriverState));
|
||||||
if (!chr)
|
if (!chr)
|
||||||
|
@ -2603,7 +2615,7 @@ static CharDriverState *qemu_chr_open_pty(void)
|
||||||
return NULL;
|
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;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2612,7 +2624,7 @@ static CharDriverState *qemu_chr_open_pty(void)
|
||||||
tcsetattr(slave_fd, TCSAFLUSH, &tty);
|
tcsetattr(slave_fd, TCSAFLUSH, &tty);
|
||||||
close(slave_fd);
|
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->opaque = s;
|
||||||
chr->chr_write = pty_chr_write;
|
chr->chr_write = pty_chr_write;
|
||||||
|
@ -3819,7 +3831,8 @@ CharDriverState *qemu_chr_open(const char *filename)
|
||||||
return qemu_chr_open_pp(filename);
|
return qemu_chr_open_pp(filename);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
#if defined(__linux__) || defined(__sun__)
|
#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
|
||||||
|
|| defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
if (strstart(filename, "/dev/", NULL)) {
|
if (strstart(filename, "/dev/", NULL)) {
|
||||||
return qemu_chr_open_tty(filename);
|
return qemu_chr_open_tty(filename);
|
||||||
} else
|
} else
|
||||||
|
|
Loading…
Reference in New Issue