ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only build osdep once 

We no longer need hackery to work around kqemu

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2009-08-10 17:14:11 -05:00
parent 4a1418e07b
commit a25a0ef51e
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -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 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 = 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-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 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.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 qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@")

2
Makefile.target
View File

@ -148,7 +148,7 @@ endif #CONFIG_BSD_USER
# System emulator target # System emulator target
ifdef CONFIG_SOFTMMU 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 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. # virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly # need to fix this properly

3
osdep.c
View File

@ -33,9 +33,6 @@
#include <sys/statvfs.h> #include <sys/statvfs.h>
#endif #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. */ /* Needed early for CONFIG_BSD etc. */
#include "config-host.h" #include "config-host.h"

4
tool-osdep.c
View File

@ -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"