falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make struct iovec universally available 

Vectored IO APIs will require some sort of vector argument.  It makes sense to
use struct iovec and just define it globally for Windows.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5889 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-12-05 20:05:26 +00:00
parent a38131b669
commit bf9298b90e
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -1017,6 +1017,17 @@ EOF
fi fi
fi fi
##########################################
# iovec probe
cat > $TMPC <<EOF
#include <sys/uio.h>
int main(void) { struct iovec iov; return 0; }
EOF
iovec=no
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
iovec=yes
fi
# Check if tools are available to build documentation. # Check if tools are available to build documentation.
if [ -x "`which texi2html 2>/dev/null`" ] && \ if [ -x "`which texi2html 2>/dev/null`" ] && \
[ -x "`which pod2man 2>/dev/null`" ]; then [ -x "`which pod2man 2>/dev/null`" ]; then
@ -1376,6 +1387,9 @@ fi
if test "$blobs" = "yes" ; then if test "$blobs" = "yes" ; then
echo "INSTALL_BLOBS=yes" >> $config_mak echo "INSTALL_BLOBS=yes" >> $config_mak
fi fi
if test "$iovec" = "yes" ; then
echo "#define HAVE_IOVEC 1" >> $config_h
fi
# XXX: suppress that # XXX: suppress that
if [ "$bsd" = "yes" ] ; then if [ "$bsd" = "yes" ] ; then

9
hw/virtio.h
View File

@ -17,15 +17,6 @@
#include "hw.h" #include "hw.h"
#include "pci.h" #include "pci.h"
#ifdef _WIN32
struct iovec {
void *iov_base;
size_t iov_len;
};
#else
#include <sys/uio.h>
#endif
/* from Linux's linux/virtio_config.h */ /* from Linux's linux/virtio_config.h */
/* Status byte for guest to report progress, and synchronize features. */ /* Status byte for guest to report progress, and synchronize features. */

10
qemu-common.h
View File

@ -16,6 +16,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "config-host.h"
#ifndef O_LARGEFILE #ifndef O_LARGEFILE
#define O_LARGEFILE 0 #define O_LARGEFILE 0
@ -28,6 +29,14 @@
#define ENOMEDIUM ENODEV #define ENOMEDIUM ENODEV
#endif #endif
#ifndef HAVE_IOVEC
#define HAVE_IOVEC
struct iovec {
void *iov_base;
size_t iov_len;
};
#endif
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define WINVER 0x0501 /* needed for ipv6 bits */ #define WINVER 0x0501 /* needed for ipv6 bits */
@ -54,7 +63,6 @@ static inline char *realpath(const char *path, char *resolved_path)
/* FIXME: Remove NEED_CPU_H. */ /* FIXME: Remove NEED_CPU_H. */
#ifndef NEED_CPU_H #ifndef NEED_CPU_H
#include "config-host.h"
#include <setjmp.h> #include <setjmp.h>
#include "osdep.h" #include "osdep.h"
#include "bswap.h" #include "bswap.h"

1
slirp/socket.c
View File

@ -11,6 +11,7 @@
#ifdef __sun__ #ifdef __sun__
#include <sys/filio.h> #include <sys/filio.h>
#endif #endif
#include "qemu-common.h"
static void sofcantrcvmore(struct socket *so); static void sofcantrcvmore(struct socket *so);
static void sofcantsendmore(struct socket *so); static void sofcantsendmore(struct socket *so);

8
slirp/socket.h
View File

@ -73,14 +73,6 @@ struct socket {
extern struct socket tcb; extern struct socket tcb;
#if defined(DECLARE_IOVEC) && !defined(HAVE_READV)
struct iovec {
char *iov_base;
size_t iov_len;
};
#endif
struct socket * solookup _P((struct socket *, struct in_addr, u_int, struct in_addr, u_int)); struct socket * solookup _P((struct socket *, struct in_addr, u_int, struct in_addr, u_int));
struct socket * socreate _P((void)); struct socket * socreate _P((void));
void sofree _P((struct socket *)); void sofree _P((struct socket *));