03ff3ca30f
Right now, we sprinkle #if defined(QEMU_IMG) && defined(QEMU_NBD) all over the code. It's ugly and causes us to have to build multiple object files for linking against qemu and the tools. This patch introduces a new file, qemu-tool.c which contains enough for qemu-img, qemu-nbd, and QEMU to all share the same objects. This also required getting qemu-nbd to be a bit more Windows friendly. I also changed the Windows block-raw to use normal IO instead of overlapping IO since we don't actually do AIO yet on Windows. I changed the various #if 0's to #if WIN32_AIO to make it easier for someone to eventually fix AIO on Windows. After this patch, there are no longer any #ifdef's related to qemu-img and qemu-nbd. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5226 c046a42c-6fe2-441c-8c8c-71466251a162
36 lines
685 B
C
36 lines
685 B
C
/* headers to use the BSD sockets */
|
|
#ifndef QEMU_SOCKET_H
|
|
#define QEMU_SOCKET_H
|
|
|
|
#ifdef _WIN32
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
|
|
#define socket_error() WSAGetLastError()
|
|
#undef EINTR
|
|
#define EWOULDBLOCK WSAEWOULDBLOCK
|
|
#define EINTR WSAEINTR
|
|
#define EINPROGRESS WSAEINPROGRESS
|
|
|
|
int inet_aton(const char *cp, struct in_addr *ia);
|
|
|
|
#else
|
|
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/tcp.h>
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#include <sys/un.h>
|
|
|
|
#define socket_error() errno
|
|
#define closesocket(s) close(s)
|
|
|
|
#endif /* !_WIN32 */
|
|
|
|
void socket_set_nonblock(int fd);
|
|
|
|
#endif /* QEMU_SOCKET_H */
|