Merge upstream QEMU 10.0.50 into the Android source tree.

This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.

Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:

  net.c        net-android.c
  qemu-char.c  qemu-char-android.c
  slirp/       slirp-android/
  etc...

Tested on linux-x86, darwin-x86 and windows host machines.

1 files changed, 18 insertions, 4 deletions

diff --git a/qemu_socket.h b/qemu_socket.h
index 896a0b5..cf65f5a 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -1,8 +1,22 @@
-#ifndef _qemu_socket_h
-#define _qemu_socket_h
+/* headers to use the BSD sockets */
+#ifndef QEMU__SOCKET_H
+#define QEMU__SOCKET_H
 
 #include "sockets.h"
-#define  socket_error()  socket_errno
+#define  socket_error()  errno
 #define  closesocket     socket_close
 
-#endif /* _qemu_socket_h */
+/* New, ipv6-ready socket helper functions, see qemu-sockets.c */
+int inet_listen(const char *str, char *ostr, int olen,
+                SocketType socktype, int port_offset);
+int inet_connect(const char *str, SocketType socktype);
+
+int unix_listen(const char *path, char *ostr, int olen);
+int unix_connect(const char *path);
+
+/* Old, ipv4 only bits.  Don't use for new code. */
+int parse_host_port(SockAddress*  saddr, const char *str);
+int parse_host_src_port(SockAddress*  haddr, SockAddress*  saddr,
+                        const char *str);
+
+#endif /* QEMU__SOCKET_H */