ia64/xen-unstable

changeset 17021:b0119e24d900

ioemu: some ifndef NO_UNIX_SOCKETS were missing
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Feb 11 10:03:19 2008 +0000 (2008-02-11)
parents dbb60ed6bc22
children fbbc0523779e
files tools/ioemu/vl.c tools/ioemu/vnc.c
line diff
     1.1 --- a/tools/ioemu/vl.c	Mon Feb 11 10:03:05 2008 +0000
     1.2 +++ b/tools/ioemu/vl.c	Mon Feb 11 10:03:19 2008 +0000
     1.3 @@ -2532,7 +2532,7 @@ static void udp_chr_update_read_handler(
     1.4  }
     1.5  
     1.6  int parse_host_port(struct sockaddr_in *saddr, const char *str);
     1.7 -#ifndef _WIN32
     1.8 +#ifndef NO_UNIX_SOCKETS
     1.9  static int parse_unix_path(struct sockaddr_un *uaddr, const char *str);
    1.10  #endif
    1.11  int parse_host_src_port(struct sockaddr_in *haddr,
    1.12 @@ -2740,7 +2740,7 @@ static void tcp_chr_accept(void *opaque)
    1.13      CharDriverState *chr = opaque;
    1.14      TCPCharDriver *s = chr->opaque;
    1.15      struct sockaddr_in saddr;
    1.16 -#ifndef _WIN32
    1.17 +#ifndef NO_UNIX_SOCKETS
    1.18      struct sockaddr_un uaddr;
    1.19  #endif
    1.20      struct sockaddr *addr;
    1.21 @@ -2748,7 +2748,7 @@ static void tcp_chr_accept(void *opaque)
    1.22      int fd;
    1.23  
    1.24      for(;;) {
    1.25 -#ifndef _WIN32
    1.26 +#ifndef NO_UNIX_SOCKETS
    1.27  	if (s->is_unix) {
    1.28  	    len = sizeof(uaddr);
    1.29  	    addr = (struct sockaddr *)&uaddr;
    1.30 @@ -2797,13 +2797,13 @@ static CharDriverState *qemu_chr_open_tc
    1.31      int do_nodelay = 0;
    1.32      const char *ptr;
    1.33      struct sockaddr_in saddr;
    1.34 -#ifndef _WIN32
    1.35 +#ifndef NO_UNIX_SOCKETS
    1.36      struct sockaddr_un uaddr;
    1.37  #endif
    1.38      struct sockaddr *addr;
    1.39      socklen_t addrlen;
    1.40  
    1.41 -#ifndef _WIN32
    1.42 +#ifndef NO_UNIX_SOCKETS
    1.43      if (is_unix) {
    1.44  	addr = (struct sockaddr *)&uaddr;
    1.45  	addrlen = sizeof(uaddr);
    1.46 @@ -2842,7 +2842,7 @@ static CharDriverState *qemu_chr_open_tc
    1.47      if (!s)
    1.48          goto fail;
    1.49  
    1.50 -#ifndef _WIN32
    1.51 +#ifndef NO_UNIX_SOCKETS
    1.52      if (is_unix)
    1.53  	fd = socket(PF_UNIX, SOCK_STREAM, 0);
    1.54      else
    1.55 @@ -2867,7 +2867,7 @@ static CharDriverState *qemu_chr_open_tc
    1.56  
    1.57      if (is_listen) {
    1.58          /* allow fast reuse */
    1.59 -#ifndef _WIN32
    1.60 +#ifndef NO_UNIX_SOCKETS
    1.61  	if (is_unix) {
    1.62  	    char path[109];
    1.63  	    strncpy(path, uaddr.sun_path, 108);
     2.1 --- a/tools/ioemu/vnc.c	Mon Feb 11 10:03:05 2008 +0000
     2.2 +++ b/tools/ioemu/vnc.c	Mon Feb 11 10:03:19 2008 +0000
     2.3 @@ -2297,7 +2297,7 @@ int vnc_display_open(DisplayState *ds, c
     2.4  {
     2.5      struct sockaddr *addr;
     2.6      struct sockaddr_in iaddr;
     2.7 -#ifndef _WIN32
     2.8 +#ifndef NO_UNIX_SOCKETS
     2.9      struct sockaddr_un uaddr;
    2.10  #endif
    2.11      int reuse_addr, ret;