From 03ff3ca30f29f422ebfd10d2bee1393efb4d4f7a Mon Sep 17 00:00:00 2001 From: aliguori Date: Mon, 15 Sep 2008 15:51:35 +0000 Subject: Use common objects for qemu-img and qemu-nbd 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 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5226 c046a42c-6fe2-441c-8c8c-71466251a162 --- qemu_socket.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qemu_socket.h') diff --git a/qemu_socket.h b/qemu_socket.h index 5229c24faa..ef2d88bfe9 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -14,11 +14,15 @@ #define EINTR WSAEINTR #define EINPROGRESS WSAEINPROGRESS +int inet_aton(const char *cp, struct in_addr *ia); + #else #include #include #include +#include +#include #include #define socket_error() errno -- cgit v1.2.3-55-g7522