diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 10:03:19 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 10:03:19 +0000 |
| commit | a20ab8a007d760117956003cdd7389de7bd45f23 (patch) | |
| tree | e38ee6034156d0de355fc73524f1b9c699ea86bd /tools | |
| parent | a408cea2055b5cc0ff84349a979c675c1e3e4109 (diff) | |
| download | xen-a20ab8a007d760117956003cdd7389de7bd45f23.tar.gz xen-a20ab8a007d760117956003cdd7389de7bd45f23.tar.bz2 xen-a20ab8a007d760117956003cdd7389de7bd45f23.zip | |
ioemu: some ifndef NO_UNIX_SOCKETS were missing
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ioemu/vl.c | 14 | ||||
| -rw-r--r-- | tools/ioemu/vnc.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c index fc81fd16e1..ebd35c5656 100644 --- a/tools/ioemu/vl.c +++ b/tools/ioemu/vl.c @@ -2532,7 +2532,7 @@ static void udp_chr_update_read_handler(CharDriverState *chr) } int parse_host_port(struct sockaddr_in *saddr, const char *str); -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS static int parse_unix_path(struct sockaddr_un *uaddr, const char *str); #endif int parse_host_src_port(struct sockaddr_in *haddr, @@ -2740,7 +2740,7 @@ static void tcp_chr_accept(void *opaque) CharDriverState *chr = opaque; TCPCharDriver *s = chr->opaque; struct sockaddr_in saddr; -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS struct sockaddr_un uaddr; #endif struct sockaddr *addr; @@ -2748,7 +2748,7 @@ static void tcp_chr_accept(void *opaque) int fd; for(;;) { -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS if (s->is_unix) { len = sizeof(uaddr); addr = (struct sockaddr *)&uaddr; @@ -2797,13 +2797,13 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str, int do_nodelay = 0; const char *ptr; struct sockaddr_in saddr; -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS struct sockaddr_un uaddr; #endif struct sockaddr *addr; socklen_t addrlen; -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS if (is_unix) { addr = (struct sockaddr *)&uaddr; addrlen = sizeof(uaddr); @@ -2842,7 +2842,7 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str, if (!s) goto fail; -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS if (is_unix) fd = socket(PF_UNIX, SOCK_STREAM, 0); else @@ -2867,7 +2867,7 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str, if (is_listen) { /* allow fast reuse */ -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS if (is_unix) { char path[109]; strncpy(path, uaddr.sun_path, 108); diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c index 0dd78dd4b4..df83f51650 100644 --- a/tools/ioemu/vnc.c +++ b/tools/ioemu/vnc.c @@ -2297,7 +2297,7 @@ int vnc_display_open(DisplayState *ds, const char *display, int find_unused) { struct sockaddr *addr; struct sockaddr_in iaddr; -#ifndef _WIN32 +#ifndef NO_UNIX_SOCKETS struct sockaddr_un uaddr; #endif int reuse_addr, ret; |