Skip to contentSkip to conversation

Let qemu-nbd build on Windows and replace QEMU_IMG/QEMU_NBD with QEMU_TOOL

RFC PATCH In review Anthony Liguori 2 participants 5 messages Sep 13, 2008 Kbuild

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 Let qemu-nbd build on Windows and replace QEMU_IMG/QEMU_NBD with QEMU_TOOL

This patch attempts to clean up the mess with qemu-nbd in the Makefile in order to get it building and working on Windows. I checked block-nbd, qemu-img, and qemu-nbd on Windows and Linux and everything seems to work. However, there were some defined(QEMU_IMG) that didn't include defined(QEMU_NBD) that now are covered by QEMU_TOOL so I'd like Laurent to look them over and see if they were intentional.

Basically, there are no longer qemu-nbd-*.o objects. qemu-img-*.o have -DQEMU_TOOL defined and qemu-img/qemu-nbd use identical copies of those objects. A special object is no longer build for nbd.c either.

My longer goal would be to eliminate as many qemu-img-* objects as possible but let's take that one step at a time.

Regards,

Anthony Liguori

block-raw-win32.c +9 -9
Index: block-raw-win32.c
===================================================================
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
 #include "qemu-timer.h"
 #include "exec-all.h"
 #endif
@@ -100,7 +100,7 @@
     } else {
         create_flags = OPEN_EXISTING;
     }
-#ifdef QEMU_IMG
+#ifdef QEMU_TOOL
     overlapped = FILE_ATTRIBUTE_NORMAL;
 #else
     overlapped = FILE_FLAG_OVERLAPPED;
@@ -165,7 +165,7 @@
 }
 
 #if 0
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
 static void raw_aio_cb(void *opaque)
 {
     RawAIOCB *acb = opaque;
@@ -204,7 +204,7 @@
     acb->ov.OffsetHigh = offset >> 32;
     acb->ov.hEvent = acb->hEvent;
     acb->count = nb_sectors * 512;
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
     qemu_add_wait_object(acb->ov.hEvent, raw_aio_cb, acb);
 #endif
     return acb;
@@ -226,7 +226,7 @@
         qemu_aio_release(acb);
         return NULL;
     }
-#ifdef QEMU_IMG
+#ifdef QEMU_TOOL
     qemu_aio_release(acb);
 #endif
     return (BlockDriverAIOCB *)acb;
@@ -248,7 +248,7 @@
         qemu_aio_release(acb);
         return NULL;
     }
-#ifdef QEMU_IMG
+#ifdef QEMU_TOOL
     qemu_aio_release(acb);
 #endif
     return (BlockDriverAIOCB *)acb;
@@ -256,7 +256,7 @@
 
 static void raw_aio_cancel(BlockDriverAIOCB *blockacb)
 {
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
     RawAIOCB *acb = (RawAIOCB *)blockacb;
     BlockDriverState *bs = acb->common.bs;
     BDRVRawState *s = bs->opaque;
@@ -356,7 +356,7 @@
 
 void qemu_aio_wait(void)
 {
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
     qemu_bh_poll();
 #endif
 }
@@ -458,7 +458,7 @@
     }
     create_flags = OPEN_EXISTING;
 
-#ifdef QEMU_IMG
+#ifdef QEMU_TOOL
     overlapped = FILE_ATTRIBUTE_NORMAL;
 #else
     overlapped = FILE_FLAG_OVERLAPPED;
nbd.c +54 -30

175 lines not on this page · raw message

qemu_socket.h +4 -0
Index: 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 <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
osdep.c +27 -0
Index: osdep.c
===================================================================
@@ -45,6 +45,8 @@
 #include <malloc.h>
 #endif
 
+#include "qemu_socket.h"
+
 #if defined(_WIN32)
 void *qemu_memalign(size_t alignment, size_t size)
 {
@@ -283,3 +285,28 @@
   return 0;
 }
 #endif /* _WIN32 */
+
+
+#ifdef _WIN32
+void socket_set_nonblock(int fd)
+{
+    unsigned long opt = 1;
+    ioctlsocket(fd, FIONBIO, &opt);
+}
+
+int inet_aton(const char *cp, struct in_addr *ia)
+{
+    uint32_t addr = inet_addr(cp);
+    if (addr == 0xffffffff)
+	return 0;
+    ia->s_addr = addr;
+    return 1;
+}
+#else
+void socket_set_nonblock(int fd)
+{
+    int f;
+    f = fcntl(fd, F_GETFL);
+    fcntl(fd, F_SETFL, f | O_NONBLOCK);
+}
+#endif
vl.c +2 -18
Index: vl.c
===================================================================
@@ -100,11 +100,10 @@
 #include <stropts.h>
 #endif
 #endif
-#else
-#include <winsock2.h>
-int inet_aton(const char *cp, struct in_addr *ia);
 #endif
 
+#include "qemu_socket.h"
+
 #if defined(CONFIG_SLIRP)
 #include "libslirp.h"
 #endif
@@ -125,8 +124,6 @@
 #define memalign(align, size) malloc(size)
 #endif
 
-#include "qemu_socket.h"
-
 #ifdef CONFIG_SDL
 #ifdef __APPLE__
 #include <SDL/SDL.h>
@@ -2131,12 +2128,6 @@
     return len1 - len;
 }
 
-void socket_set_nonblock(int fd)
-{
-    unsigned long opt = 1;
-    ioctlsocket(fd, FIONBIO, &opt);
-}
-
 #else
 
 static int unix_write(int fd, const uint8_t *buf, int len1)
@@ -2163,13 +2154,6 @@
 {
     return unix_write(fd, buf, len1);
 }
-
-void socket_set_nonblock(int fd)
-{
-    int f;
-    f = fcntl(fd, F_GETFL);
-    fcntl(fd, F_SETFL, f | O_NONBLOCK);
-}
 #endif /* !_WIN32 */
 
 #ifndef _WIN32
block-raw-posix.c +13 -13
Index: block-raw-posix.c
===================================================================
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if !defined(QEMU_TOOL)
 #include "qemu-timer.h"
 #include "exec-all.h"
 #include "qemu-char.h"
@@ -70,7 +70,7 @@
 //#define DEBUG_FLOPPY
 
 //#define DEBUG_BLOCK
-#if defined(DEBUG_BLOCK) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(DEBUG_BLOCK) && !defined(QEMU_TOOL)
 #define DEBUG_BLOCK_PRINT(formatCstr, args...) do { if (loglevel != 0)	\
     { fprintf(logfile, formatCstr, ##args); fflush(logfile); } } while (0)
 #else
@@ -99,7 +99,7 @@
     int fd_got_error;
     int fd_media_changed;
 #endif
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT) && !defined(QEMU_TOOL)
     uint8_t* aligned_buf;
 #endif
 } BDRVRawState;
@@ -137,7 +137,7 @@
         return ret;
     }
     s->fd = fd;
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT) && !defined(QEMU_TOOL)
     s->aligned_buf = NULL;
     if (flags & BDRV_O_DIRECT) {
         s->aligned_buf = qemu_memalign(512, ALIGNED_BUFFER_SIZE);
@@ -272,7 +272,7 @@
 }
 
 
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT) && !defined(QEMU_TOOL)
 /*
  * offset and count are in bytes and possibly not aligned. For files opened
  * with O_DIRECT, necessary alignments are ensured before calling
@@ -525,7 +525,7 @@
 
     fcntl(aio_sig_fd, F_SETFL, O_NONBLOCK);
 
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if !defined(QEMU_TOOL)
     qemu_set_fd_handler2(aio_sig_fd, NULL, qemu_aio_poll, NULL, NULL);
 #endif
 
@@ -556,7 +556,7 @@
 {
     int ret;
 
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if !defined(QEMU_TOOL)
     if (qemu_bh_poll())
         return;
 #endif
@@ -605,7 +605,7 @@
     return acb;
 }
 
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if !defined(QEMU_TOOL)
 static void raw_aio_em_cb(void* opaque)
 {
     RawAIOCB *acb = opaque;
@@ -624,7 +624,7 @@
      * If O_DIRECT is used and the buffer is not aligned fall back
      * to synchronous IO.
      */
-#if defined(O_DIRECT) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(O_DIRECT) && !defined(QEMU_TOOL)
     BDRVRawState *s = bs->opaque;
 
     if (unlikely(s->aligned_buf != NULL && ((uintptr_t) buf % 512))) {
@@ -657,7 +657,7 @@
      * If O_DIRECT is used and the buffer is not aligned fall back
      * to synchronous IO.
      */
-#if defined(O_DIRECT) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(O_DIRECT) && !defined(QEMU_TOOL)
     BDRVRawState *s = bs->opaque;
 
     if (unlikely(s->aligned_buf != NULL && ((uintptr_t) buf % 512))) {
@@ -719,7 +719,7 @@
 
 void qemu_aio_wait(void)
 {
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if !defined(QEMU_TOOL)
     qemu_bh_poll();
 #endif
 }
@@ -732,7 +732,7 @@
     if (s->fd >= 0) {
         close(s->fd);
         s->fd = -1;
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT) && !defined(QEMU_TOOL)
         if (s->aligned_buf != NULL)
             qemu_free(s->aligned_buf);
 #endif
@@ -1002,7 +1002,7 @@
     return 0;
 }
 
-#if defined(__linux__) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(__linux__) && !defined(QEMU_TOOL)
 
 /* Note: we do not have a reliable method to detect if the floppy is
    present. The current method is to try to open the floppy at every
Makefile +13 -19
Index: Makefile
===================================================================
@@ -28,6 +28,10 @@
 LIBS+=-lsocket -lnsl -lresolv
 endif
 
+ifdef CONFIG_WIN32
+LIBS+=-lwinmm -lws2_32 -liphlpapi
+endif
+
 all: $(TOOLS) $(DOCS) recurse-all 
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
@@ -46,9 +50,11 @@
 BLOCK_OBJS=cutils.o qemu-malloc.o
 BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
 BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
-BLOCK_OBJS+=block-qcow2.o block-parallels.o
-ifndef CONFIG_WIN32
-BLOCK_OBJS+=block-nbd.o
+BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
+BLOCK_OBJS+=nbd.o
+
+ifdef CONFIG_AIO
+BLOCK_OBJS += compatfd.o
 endif
 
 ######################################################################
@@ -61,10 +67,6 @@
 OBJS+=readline.o console.o
 OBJS+=block.o
 
-ifndef CONFIG_WIN32
-OBJS+=nbd.o
-endif
-
 OBJS+=irq.o
 OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
 OBJS+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
@@ -177,29 +179,21 @@
 ifdef CONFIG_WIN32
 QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
 else
-QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o
+QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-posix.o
 endif
 
-ifdef CONFIG_AIO
-QEMU_IMG_BLOCK_OBJS += compatfd.o
-endif
-
 ######################################################################
 
-qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-img-block.o osdep.o $(QEMU_IMG_BLOCK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
 qemu-img-%.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG -c -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_TOOL -c -o $@ $<
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
-qemu-nbd-%.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_NBD -c -o $@ $<
-
-qemu-nbd$(EXESUF):  qemu-nbd.o qemu-nbd-nbd.o qemu-img-block.o \
-		    osdep.o qemu-nbd-block-raw-posix.o compatfd.o $(BLOCK_OBJS)
+qemu-nbd$(EXESUF):  qemu-nbd.o qemu-img-block.o osdep.o $(QEMU_IMG_BLOCK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
 # dyngen host tool
misc.c +0 -14
Index: slirp/misc.c
===================================================================
@@ -66,20 +66,6 @@
 }
 #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
  */
block.c +4 -6
Index: block.c
===================================================================
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
 #include "console.h"
 #endif
 #include "block_int.h"
@@ -922,7 +922,7 @@
     return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum);
 }
 
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
 void bdrv_info(void)
 {
     BlockDriverState *bs;
@@ -1203,7 +1203,7 @@
 /**************************************************************/
 /* async block device emulation */
 
-#ifdef QEMU_IMG
+#ifdef QEMU_TOOL
 static BlockDriverAIOCB *bdrv_aio_read_em(BlockDriverState *bs,
         int64_t sector_num, uint8_t *buf, int nb_sectors,
         BlockDriverCompletionFunc *cb, void *opaque)
@@ -1273,7 +1273,7 @@
     qemu_bh_cancel(acb->bh);
     qemu_aio_release(acb);
 }
-#endif /* !QEMU_IMG */
+#endif /* !QEMU_TOOL */
 
 /**************************************************************/
 /* sync block device emulation */
@@ -1337,9 +1337,7 @@
     bdrv_register(&bdrv_vvfat);
     bdrv_register(&bdrv_qcow2);
     bdrv_register(&bdrv_parallels);
-#ifndef _WIN32
     bdrv_register(&bdrv_nbd);
-#endif
 
     qemu_aio_init();
 }
block.h +1 -1
Index: block.h
===================================================================
@@ -47,7 +47,7 @@
                                      bdrv_file_open()) */
 #define BDRV_O_DIRECT      0x0020
 
-#ifndef QEMU_IMG
+#ifndef QEMU_TOOL
 void bdrv_info(void);
 void bdrv_info_stats(void);
 #endif
#1 lore raw
Quoted 6 lines · Anthony Liguori

This patch attempts to clean up the mess with qemu-nbd in the Makefile in order to get it building and working on Windows. I checked block-nbd, qemu-img, and qemu-nbd on Windows and Linux and everything seems to work. However, there were some defined(QEMU_IMG) that didn't include defined(QEMU_NBD) that now are covered by QEMU_TOOL so I'd like Laurent to look them over and see if they were intentional.

If I remember correctly they were intentional:
- some of them because qemu-nbd didn't support windows (but you have corrected this)
- others because qemu-img doesn't need to open file with O_DIRECT whereas qemu-nbd must (--nocache option) (and I think you break this)

Did you test "qemu-nbd --nocache" ?

Quoted 6 lines

Basically, there are no longer qemu-nbd-*.o objects. qemu-img-*.o have -DQEMU_TOOL defined and qemu-img/qemu-nbd use identical copies of those objects. A special object is no longer build for nbd.c either.

My longer goal would be to eliminate as many qemu-img-* objects as possible but let's take that one step at a time.

I think it's a good idea...

Regards,
Laurent

Signature · 3 lines
----------------- [email protected]  ------------------
  "La perfection est atteinte non quand il ne reste rien à
ajouter mais quand il ne reste rien à enlever." Saint Exupéry
#2 lore raw
Quoted 5 lines · Laurent Vivier
Quoted 2 lines · Anthony Liguori

This patch attempts to clean up the mess with qemu-nbd in the Makefile in order to get it building and working on Windows. I checked block-nbd, qemu-img, and qemu-nbd on Windows and Linux and everything seems to work. However, there were some defined(QEMU_IMG) that didn't include defined(QEMU_NBD) that now are covered by QEMU_TOOL so I'd like Laurent to look them over and see if they were intentional.

Quoted 8 lines

If I remember correctly they were intentional:
- some of them because qemu-nbd didn't support windows (but you have corrected this)
- others because qemu-img doesn't need to open file with O_DIRECT whereas qemu-nbd must (--nocache option) (and I think you break this)

Did you test "qemu-nbd --nocache" ?

No, but this is why I asked :-)

So this begs the question, why does qemu-nbd need to open files with O_DIRECT and why doesn't qemu-img?

Can we just enable the code in both?

Regards,

Anthony Liguori

Quoted 12 lines
Quoted 6 lines

Basically, there are no longer qemu-nbd-*.o objects. qemu-img-*.o have -DQEMU_TOOL defined and qemu-img/qemu-nbd use identical copies of those objects. A special object is no longer build for nbd.c either.

My longer goal would be to eliminate as many qemu-img-* objects as possible but let's take that one step at a time.

I think it's a good idea...

Regards,
Laurent

#3 lore raw
Quoted 12 lines · Anthony Liguori
Quoted 11 lines · Laurent Vivier
Quoted 2 lines · Anthony Liguori

This patch attempts to clean up the mess with qemu-nbd in the Makefile in order to get it building and working on Windows. I checked block-nbd, qemu-img, and qemu-nbd on Windows and Linux and everything seems to work. However, there were some defined(QEMU_IMG) that didn't include defined(QEMU_NBD) that now are covered by QEMU_TOOL so I'd like Laurent to look them over and see if they were intentional.

If I remember correctly they were intentional:
- some of them because qemu-nbd didn't support windows (but you have corrected this)
- others because qemu-img doesn't need to open file with O_DIRECT whereas qemu-nbd must (--nocache option) (and I think you break this)

Quoted 8 lines
Quoted 2 lines

Did you test "qemu-nbd --nocache" ?

No, but this is why I asked :-)

So this begs the question, why does qemu-nbd need to open files with O_DIRECT and why doesn't qemu-img?

Can we just enable the code in both?

Oh, I see. It's because we don't have bottom halves with QEMU_TOOL. That's easy enough to fix. I'll update the patch.

Regards,

Anthony Liguori

#4 lore raw
In reply to Laurent Vivier
Quoted 9 lines · Laurent Vivier
Quoted 6 lines

Basically, there are no longer qemu-nbd-*.o objects. qemu-img-*.o have -DQEMU_TOOL defined and qemu-img/qemu-nbd use identical copies of those objects. A special object is no longer build for nbd.c either.

My longer goal would be to eliminate as many qemu-img-* objects as possible but let's take that one step at a time.

I think it's a good idea...

Okay, the attached patch takes things to the logical conclusion. It introduces a qemu-tool.c file that has enough stub code to completely eliminate the QEMU_IMG and QEMU_NBD defines. The result is that we no longer need special qemu-img- or qemu-nbd- objects.

I've done some light testing of Windows and Linux and it seems to work well. I'd like some other folks to give it some testing too though because it touches a lot of code.

Regards,

Anthony Liguori

Quoted 3 lines

Regards,
Laurent

Subject: [PATCH] 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.

Index: block-raw-win32.c
===================================================================

Makefile +17 -28
index 708941c..7bb2bf2 100644
@@ -28,6 +28,10 @@ ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv
 endif
 
+ifdef CONFIG_WIN32
+LIBS+=-lwinmm -lws2_32 -liphlpapi
+endif
+
 all: $(TOOLS) $(DOCS) recurse-all 
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
@@ -46,9 +50,17 @@ recurse-all: $(SUBDIR_RULES)
 BLOCK_OBJS=cutils.o qemu-malloc.o
 BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
 BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
-BLOCK_OBJS+=block-qcow2.o block-parallels.o
-ifndef CONFIG_WIN32
-BLOCK_OBJS+=block-nbd.o
+BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
+BLOCK_OBJS+=nbd.o block.o
+
+ifdef CONFIG_WIN32
+BLOCK_OBJS += block-raw-win32.o
+else
+BLOCK_OBJS += block-raw-posix.o
+endif
+
+ifdef CONFIG_AIO
+BLOCK_OBJS += compatfd.o
 endif
 
 ######################################################################
@@ -59,11 +71,6 @@ endif
 
 OBJS=$(BLOCK_OBJS)
 OBJS+=readline.o console.o
-OBJS+=block.o
-
-ifndef CONFIG_WIN32
-OBJS+=nbd.o
-endif
 
 OBJS+=irq.o
 OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
@@ -173,33 +180,15 @@ libqemu_user.a: $(USER_OBJS)
 	rm -f $@ 
 	$(AR) rcs $@ $(USER_OBJS)
 
-QEMU_IMG_BLOCK_OBJS = $(BLOCK_OBJS)
-ifdef CONFIG_WIN32
-QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
-else
-QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o
-endif
-
-ifdef CONFIG_AIO
-QEMU_IMG_BLOCK_OBJS += compatfd.o
-endif
-
 ######################################################################
 
-qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
-qemu-img-%.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG -c -o $@ $<
-
 %.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
-qemu-nbd-%.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_NBD -c -o $@ $<
-
-qemu-nbd$(EXESUF):  qemu-nbd.o qemu-nbd-nbd.o qemu-img-block.o \
-		    osdep.o qemu-nbd-block-raw-posix.o compatfd.o $(BLOCK_OBJS)
+qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
 # dyngen host tool
block-raw-posix.c +8 -27
index eaf3bf2..e314f4a 100644
@@ -22,11 +22,8 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
 #include "qemu-timer.h"
-#include "exec-all.h"
 #include "qemu-char.h"
-#endif
 #include "block_int.h"
 #include "compatfd.h"
 #include <assert.h>
@@ -70,7 +67,7 @@
 //#define DEBUG_FLOPPY
 
 //#define DEBUG_BLOCK
-#if defined(DEBUG_BLOCK) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(DEBUG_BLOCK)
 #define DEBUG_BLOCK_PRINT(formatCstr, args...) do { if (loglevel != 0)	\
     { fprintf(logfile, formatCstr, ##args); fflush(logfile); } } while (0)
 #else
@@ -99,7 +96,7 @@ typedef struct BDRVRawState {
     int fd_got_error;
     int fd_media_changed;
 #endif
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT)
     uint8_t* aligned_buf;
 #endif
 } BDRVRawState;
@@ -137,7 +134,7 @@ static int raw_open(BlockDriverState *bs, const char *filename, int flags)
         return ret;
     }
     s->fd = fd;
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT)
     s->aligned_buf = NULL;
     if (flags & BDRV_O_DIRECT) {
         s->aligned_buf = qemu_memalign(512, ALIGNED_BUFFER_SIZE);
@@ -272,7 +269,7 @@ label__raw_write__success:
 }
 
 
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT)
 /*
  * offset and count are in bytes and possibly not aligned. For files opened
  * with O_DIRECT, necessary alignments are ensured before calling
@@ -525,9 +522,7 @@ void qemu_aio_init(void)
 
     fcntl(aio_sig_fd, F_SETFL, O_NONBLOCK);
 
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
     qemu_set_fd_handler2(aio_sig_fd, NULL, qemu_aio_poll, NULL, NULL);
-#endif
 
 #if defined(__GLIBC__) && defined(__linux__)
     {
@@ -556,10 +551,8 @@ void qemu_aio_wait(void)
 {
     int ret;
 
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
     if (qemu_bh_poll())
         return;
-#endif
 
     if (!first_aio)
         return;
@@ -605,14 +598,12 @@ static RawAIOCB *raw_aio_setup(BlockDriverState *bs,
     return acb;
 }
 
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
 static void raw_aio_em_cb(void* opaque)
 {
     RawAIOCB *acb = opaque;
     acb->common.cb(acb->common.opaque, acb->ret);
     qemu_aio_release(acb);
 }
-#endif
 
 static BlockDriverAIOCB *raw_aio_read(BlockDriverState *bs,
         int64_t sector_num, uint8_t *buf, int nb_sectors,
@@ -624,7 +615,7 @@ static BlockDriverAIOCB *raw_aio_read(BlockDriverState *bs,
      * If O_DIRECT is used and the buffer is not aligned fall back
      * to synchronous IO.
      */
-#if defined(O_DIRECT) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(O_DIRECT)
     BDRVRawState *s = bs->opaque;
 
     if (unlikely(s->aligned_buf != NULL && ((uintptr_t) buf % 512))) {
@@ -657,7 +648,7 @@ static BlockDriverAIOCB *raw_aio_write(BlockDriverState *bs,
      * If O_DIRECT is used and the buffer is not aligned fall back
      * to synchronous IO.
      */
-#if defined(O_DIRECT) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(O_DIRECT)
     BDRVRawState *s = bs->opaque;
 
     if (unlikely(s->aligned_buf != NULL && ((uintptr_t) buf % 512))) {
@@ -719,9 +710,7 @@ void qemu_aio_flush(void)
 
 void qemu_aio_wait(void)
 {
-#if !defined(QEMU_IMG) && !defined(QEMU_NBD)
     qemu_bh_poll();
-#endif
 }
 
 #endif /* CONFIG_AIO */
@@ -732,7 +721,7 @@ static void raw_close(BlockDriverState *bs)
     if (s->fd >= 0) {
         close(s->fd);
         s->fd = -1;
-#if defined(O_DIRECT) && !defined(QEMU_IMG)
+#if defined(O_DIRECT)
         if (s->aligned_buf != NULL)
             qemu_free(s->aligned_buf);
 #endif
@@ -1002,7 +991,7 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags)
     return 0;
 }
 
-#if defined(__linux__) && !defined(QEMU_IMG) && !defined(QEMU_NBD)
+#if defined(__linux__)
 
 /* Note: we do not have a reliable method to detect if the floppy is
    present. The current method is to try to open the floppy at every
@@ -1052,14 +1041,6 @@ static int fd_open(BlockDriverState *bs)
     s->fd_got_error = 0;
     return 0;
 }
-#else
-static int fd_open(BlockDriverState *bs)
-{
-    return 0;
-}
-#endif
-
-#if defined(__linux__)
 
 static int raw_is_inserted(BlockDriverState *bs)
 {
block-raw-win32.c +16 -25

149 lines not on this page · raw message

block.c +0 -32
index 52c8f37..4811797 100644
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#ifndef QEMU_IMG
 #include "console.h"
-#endif
 #include "block_int.h"
 
 #ifdef _BSD
@@ -922,7 +920,6 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
     return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum);
 }
 
-#ifndef QEMU_IMG
 void bdrv_info(void)
 {
     BlockDriverState *bs;
@@ -980,7 +977,6 @@ void bdrv_info_stats (void)
 		     bs->rd_ops, bs->wr_ops);
     }
 }
-#endif
 
 void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size)
@@ -1203,31 +1199,6 @@ void bdrv_aio_cancel(BlockDriverAIOCB *acb)
 /**************************************************************/
 /* async block device emulation */
 
-#ifdef QEMU_IMG
-static BlockDriverAIOCB *bdrv_aio_read_em(BlockDriverState *bs,
-        int64_t sector_num, uint8_t *buf, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    int ret;
-    ret = bdrv_read(bs, sector_num, buf, nb_sectors);
-    cb(opaque, ret);
-    return NULL;
-}
-
-static BlockDriverAIOCB *bdrv_aio_write_em(BlockDriverState *bs,
-        int64_t sector_num, const uint8_t *buf, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    int ret;
-    ret = bdrv_write(bs, sector_num, buf, nb_sectors);
-    cb(opaque, ret);
-    return NULL;
-}
-
-static void bdrv_aio_cancel_em(BlockDriverAIOCB *acb)
-{
-}
-#else
 static void bdrv_aio_bh_cb(void *opaque)
 {
     BlockDriverAIOCBSync *acb = opaque;
@@ -1273,7 +1244,6 @@ static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)
     qemu_bh_cancel(acb->bh);
     qemu_aio_release(acb);
 }
-#endif /* !QEMU_IMG */
 
 /**************************************************************/
 /* sync block device emulation */
@@ -1337,9 +1307,7 @@ void bdrv_init(void)
     bdrv_register(&bdrv_vvfat);
     bdrv_register(&bdrv_qcow2);
     bdrv_register(&bdrv_parallels);
-#ifndef _WIN32
     bdrv_register(&bdrv_nbd);
-#endif
 
     qemu_aio_init();
 }
block.h +0 -2
index 0443585..d774a2e 100644
@@ -47,10 +47,8 @@ typedef struct QEMUSnapshotInfo {
                                      bdrv_file_open()) */
 #define BDRV_O_DIRECT      0x0020
 
-#ifndef QEMU_IMG
 void bdrv_info(void);
 void bdrv_info_stats(void);
-#endif
 
 void bdrv_init(void);
 BlockDriver *bdrv_find_format(const char *format_name);
nbd.c +55 -31

174 lines not on this page · raw message

osdep.c +27 -0
index a49efba..683aad0 100644
@@ -45,6 +45,8 @@
 #include <malloc.h>
 #endif
 
+#include "qemu_socket.h"
+
 #if defined(_WIN32)
 void *qemu_memalign(size_t alignment, size_t size)
 {
@@ -283,3 +285,28 @@ int qemu_gettimeofday(qemu_timeval *tp)
   return 0;
 }
 #endif /* _WIN32 */
+
+
+#ifdef _WIN32
+void socket_set_nonblock(int fd)
+{
+    unsigned long opt = 1;
+    ioctlsocket(fd, FIONBIO, &opt);
+}
+
+int inet_aton(const char *cp, struct in_addr *ia)
+{
+    uint32_t addr = inet_addr(cp);
+    if (addr == 0xffffffff)
+	return 0;
+    ia->s_addr = addr;
+    return 1;
+}
+#else
+void socket_set_nonblock(int fd)
+{
+    int f;
+    f = fcntl(fd, F_GETFL);
+    fcntl(fd, F_SETFL, f | O_NONBLOCK);
+}
+#endif
qemu-tool.c new file +83 -0

83 lines not on this page · raw message

qemu_socket.h +4 -0
index 5229c24..ef2d88b 100644
@@ -14,11 +14,15 @@
 #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
slirp/misc.c +0 -14
index 032a1f7..09b9c54 100644
@@ -66,20 +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
  */
vl.c +2 -18
index 18bcc1f..70f8645 100644
@@ -100,11 +100,10 @@
 #include <stropts.h>
 #endif
 #endif
-#else
-#include <winsock2.h>
-int inet_aton(const char *cp, struct in_addr *ia);
 #endif
 
+#include "qemu_socket.h"
+
 #if defined(CONFIG_SLIRP)
 #include "libslirp.h"
 #endif
@@ -125,8 +124,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #define memalign(align, size) malloc(size)
 #endif
 
-#include "qemu_socket.h"
-
 #ifdef CONFIG_SDL
 #ifdef __APPLE__
 #include <SDL/SDL.h>
@@ -2131,12 +2128,6 @@ static int send_all(int fd, const uint8_t *buf, int len1)
     return len1 - len;
 }
 
-void socket_set_nonblock(int fd)
-{
-    unsigned long opt = 1;
-    ioctlsocket(fd, FIONBIO, &opt);
-}
-
 #else
 
 static int unix_write(int fd, const uint8_t *buf, int len1)
@@ -2163,13 +2154,6 @@ static inline int send_all(int fd, const uint8_t *buf, int len1)
 {
     return unix_write(fd, buf, len1);
 }
-
-void socket_set_nonblock(int fd)
-{
-    int f;
-    f = fcntl(fd, F_GETFL);
-    fcntl(fd, F_SETFL, f | O_NONBLOCK);
-}
 #endif /* !_WIN32 */
 
 #ifndef _WIN32