[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/10] chardev: reduce chardev ifdef mess a bit
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v3 03/10] chardev: reduce chardev ifdef mess a bit |
Date: |
Fri, 11 Jan 2013 12:20:12 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-char.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index a29c2bb..c511de3 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -856,6 +856,8 @@ static void cfmakeraw (struct termios *termios_p)
|| defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
|| defined(__GLIBC__)
+#define HAVE_CHARDEV_TTY 1
+
typedef struct {
int fd;
int connected;
@@ -1244,14 +1246,12 @@ static CharDriverState *qemu_chr_open_tty(QemuOpts
*opts)
chr->chr_close = qemu_chr_close_tty;
return chr;
}
-#else /* ! __linux__ && ! __sun__ */
-static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
-{
- return NULL;
-}
#endif /* __linux__ || __sun__ */
#if defined(__linux__)
+
+#define HAVE_CHARDEV_PARPORT 1
+
typedef struct {
int fd;
int mode;
@@ -1395,6 +1395,9 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
#endif /* __linux__ */
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__DragonFly__)
+
+#define HAVE_CHARDEV_PARPORT 1
+
static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
{
int fd = (int)(intptr_t)chr->opaque;
@@ -2755,19 +2758,16 @@ static const struct {
#else
{ .name = "file", .open = qemu_chr_open_file_out },
{ .name = "pipe", .open = qemu_chr_open_pipe },
- { .name = "pty", .open = qemu_chr_open_pty },
{ .name = "stdio", .open = qemu_chr_open_stdio },
#endif
#ifdef CONFIG_BRLAPI
{ .name = "braille", .open = chr_baum_init },
#endif
-#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
- || defined(__FreeBSD_kernel__)
+#ifdef HAVE_CHARDEV_TTY
{ .name = "tty", .open = qemu_chr_open_tty },
+ { .name = "pty", .open = qemu_chr_open_pty },
#endif
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) \
- || defined(__FreeBSD_kernel__)
+#ifdef HAVE_CHARDEV_PARPORT
{ .name = "parport", .open = qemu_chr_open_pp },
#endif
#ifdef CONFIG_SPICE
--
1.7.1
- [Qemu-devel] [PATCH v3 00/10] chardev hotplug patch series, Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 05/10] chardev: add hmp hotplug commands, Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 06/10] chardev: add file chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 09/10] chardev: add socket chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 04/10] chardev: add qmp hotplug commands, with null chardev support, Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 10/10] chardev: add pty chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 07/10] chardev: add serial chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 03/10] chardev: reduce chardev ifdef mess a bit,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v3 02/10] chardev: fix QemuOpts lifecycle, Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 08/10] chardev: add parallel chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/11
- [Qemu-devel] [PATCH v3 01/10] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2013/01/11
- Re: [Qemu-devel] [PATCH v3 00/10] chardev hotplug patch series, Eric Blake, 2013/01/11