david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chardev: reduce chardev ifdef mess a bit

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-12-19 16:35:42 +01:00
parent 2274ae9d1a
commit e551498e72
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qemu-char.c
View File

@ -856,6 +856,8 @@ static void cfmakeraw (struct termios *termios_p)
|| defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
|| defined(__GLIBC__) || defined(__GLIBC__)
#define HAVE_CHARDEV_TTY 1
typedef struct { typedef struct {
int fd; int fd;
int connected; int connected;
@ -1244,14 +1246,12 @@ static CharDriverState *qemu_chr_open_tty(QemuOpts *opts)
chr->chr_close = qemu_chr_close_tty; chr->chr_close = qemu_chr_close_tty;
return chr; return chr;
} }
#else /* ! __linux__ && ! __sun__ */
static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
{
return NULL;
}
#endif /* __linux__ || __sun__ */ #endif /* __linux__ || __sun__ */
#if defined(__linux__) #if defined(__linux__)
#define HAVE_CHARDEV_PARPORT 1
typedef struct { typedef struct {
int fd; int fd;
int mode; int mode;
@ -1395,6 +1395,9 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
#endif /* __linux__ */ #endif /* __linux__ */
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#define HAVE_CHARDEV_PARPORT 1
static int pp_ioctl(CharDriverState *chr, int cmd, void *arg) static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
{ {
int fd = (int)(intptr_t)chr->opaque; int fd = (int)(intptr_t)chr->opaque;
@ -2755,19 +2758,16 @@ static const struct {
#else #else
{ .name = "file", .open = qemu_chr_open_file_out }, { .name = "file", .open = qemu_chr_open_file_out },
{ .name = "pipe", .open = qemu_chr_open_pipe }, { .name = "pipe", .open = qemu_chr_open_pipe },
{ .name = "pty", .open = qemu_chr_open_pty },
{ .name = "stdio", .open = qemu_chr_open_stdio }, { .name = "stdio", .open = qemu_chr_open_stdio },
#endif #endif
#ifdef CONFIG_BRLAPI #ifdef CONFIG_BRLAPI
{ .name = "braille", .open = chr_baum_init }, { .name = "braille", .open = chr_baum_init },
#endif #endif
#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ #ifdef HAVE_CHARDEV_TTY
|| defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
|| defined(__FreeBSD_kernel__)
{ .name = "tty", .open = qemu_chr_open_tty }, { .name = "tty", .open = qemu_chr_open_tty },
{ .name = "pty", .open = qemu_chr_open_pty },
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) \ #ifdef HAVE_CHARDEV_PARPORT
|| defined(__FreeBSD_kernel__)
{ .name = "parport", .open = qemu_chr_open_pp }, { .name = "parport", .open = qemu_chr_open_pp },
#endif #endif
#ifdef CONFIG_SPICE #ifdef CONFIG_SPICE