[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/9] chardev: reduce chardev ifdef mess a bit
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/9] chardev: reduce chardev ifdef mess a bit |
Date: |
Wed, 19 Dec 2012 16:59:01 +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 9bb3a6b..208c525 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -853,6 +853,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;
@@ -1234,14 +1236,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;
@@ -1385,6 +1385,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;
@@ -2745,19 +2748,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 RfC 0/9] chardev hotplug, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 2/9] chardev: fix QemuOpts lifecycle, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 9/9] chardev: hotplug, qmp, parallel, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 6/9] chardev: hotplug, qmp, file, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 7/9] chardev: hotplug, qmp, tty, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 4/9] chardev: hotplug, qmp, null, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 1/9] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 3/9] chardev: reduce chardev ifdef mess a bit,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/9] chardev: hotplug, hmp, Gerd Hoffmann, 2012/12/19
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Michal Privoznik, 2012/12/20
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Daniel P. Berrange, 2012/12/20
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Paolo Bonzini, 2012/12/20
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Gerd Hoffmann, 2012/12/20
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Gerd Hoffmann, 2012/12/20
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Gerd Hoffmann, 2012/12/21
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Paolo Bonzini, 2012/12/21
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Gerd Hoffmann, 2012/12/21