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 --- block.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'block.h') diff --git a/block.h b/block.h index 044358539f..d774a2e1f6 100644 --- a/block.h +++ b/block.h @@ -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); -- cgit v1.2.3