diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 17:14:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-24 08:02:55 -0500 |
| commit | a25a0ef51e642130017e19f3e41af1b794aa75c1 (patch) | |
| tree | 207ba86cf1a85e5a724c8445f278591a48a45be4 | |
| parent | 4a1418e07bdcfaa3177739e04707ecaec75d89e1 (diff) | |
Only build osdep once
We no longer need hackery to work around kqemu
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | osdep.c | 3 | ||||
| -rw-r--r-- | tool-osdep.c | 4 |
4 files changed, 5 insertions, 12 deletions
@@ -54,7 +54,7 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) # block-obj-y is code used by both qemu system emulation and qemu-img block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o -block-obj-y += nbd.o block.o aio.o aes.o +block-obj-y += nbd.o block.o aio.o aes.o osdep.o block-obj-$(CONFIG_AIO) += posix-aio-compat.o block-nested-y += cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o @@ -170,11 +170,11 @@ libqemu_user.a: $(user-obj-y) qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(block-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(block-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) -qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y) +qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") diff --git a/Makefile.target b/Makefile.target index 25e6cf0095..ed948409d1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -148,7 +148,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ +obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \ gdbstub.o gdbstub-xml.o msix.o ioport.o qemu-config.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly @@ -33,9 +33,6 @@ #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 CONFIG_BSD etc. */ #include "config-host.h" diff --git a/tool-osdep.c b/tool-osdep.c deleted file mode 100644 index 24e6edf9e0..0000000000 --- a/tool-osdep.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Hack to provide a version of osdep.o for qemu-img without conflicting with - the (kqemu) target specific osdep.o. */ -#include "osdep.c" - |