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 <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5226 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 0 insertions, 12 deletions

diff --git a/misc.c b/misc.c
index 6b65399..f516929 100644
--- a/misc.c
+++ b/misc.c
@@ -66,18 +66,6 @@ redir_x(inaddr, start_port, display, screen)
 }
 #endif
 
-#ifndef HAVE_INET_ATON
-int inet_aton(cp, ia) const char *cp;
-struct in_addr *ia;
-{
-    u_int32_t addr = inet_addr(cp);
-    if (addr == 0xffffffff)
-        return 0;
-    ia->s_addr = addr;
-    return 1;
-}
-#endif
-
 /*
  * Get our IP address and put it in our_addr
  */