From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtFM3-00054Q-Qu for qemu-devel@nongnu.org; Thu, 10 Jan 2013 05:27:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtFM2-0001rW-5y for qemu-devel@nongnu.org; Thu, 10 Jan 2013 05:27:23 -0500 Received: from mail-qc0-f171.google.com ([209.85.216.171]:33120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtFM2-0001rR-1q for qemu-devel@nongnu.org; Thu, 10 Jan 2013 05:27:22 -0500 Received: by mail-qc0-f171.google.com with SMTP id d1so235883qca.2 for ; Thu, 10 Jan 2013 02:27:21 -0800 (PST) Sender: Paolo Bonzini Message-ID: <50EE9781.3020606@redhat.com> Date: Thu, 10 Jan 2013 11:27:13 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1357566928-25361-1-git-send-email-kraxel@redhat.com> <1357566928-25361-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1357566928-25361-4-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 03/11] chardev: reduce chardev ifdef mess a bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Il 07/01/2013 14:55, Gerd Hoffmann ha scritto: > Signed-off-by: Gerd Hoffmann Reviewed-by: Paolo Bonzini Paolo > --- > 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 >