[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 88ca2a5] Add tool_osdep.c
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 88ca2a5] Add tool_osdep.c |
Date: |
Wed, 13 May 2009 21:24:23 -0000 |
From: Paul Brook <address@hidden>
osdep.c is built in both as a toplevel target independant object, and
as a per-target object because of kqemu dependencies. Under some
circumstances make picks up the wrong one.
Build the former as tool-osdep to avoid this conflict.
Signed-off-by: Paul Brook <address@hidden>
diff --git a/Makefile b/Makefile
index 8649938..e996a99 100644
--- a/Makefile
+++ b/Makefile
@@ -222,11 +222,11 @@ libqemu_user.a: $(USER_OBJS)
######################################################################
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
+qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
-qemu-io$(EXESUF): qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS)
+qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS)
qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
diff --git a/osdep.c b/osdep.c
index 3696601..b300ba1 100644
--- a/osdep.c
+++ b/osdep.c
@@ -33,6 +33,9 @@
#include <sys/statvfs.h>
#endif
+/* FIXME: This file should be target independent. However it has kqemu
+ hacks, so must be built for every target. */
+
/* Needed early for HOST_BSD etc. */
#include "config-host.h"
diff --git a/tool-osdep.c b/tool-osdep.c
new file mode 100644
index 0000000..24e6edf
--- /dev/null
+++ b/tool-osdep.c
@@ -0,0 +1,4 @@
+/* Hack to provide a version of osdep.o for qemu-img without conflicting with
+ the (kqemu) target specific osdep.o. */
+#include "osdep.c"
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 88ca2a5] Add tool_osdep.c,
Anthony Liguori <=