aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-03-15 17:01:24 +0100
committerKevin Wolf <kwolf@redhat.com>2010-04-23 16:08:45 +0200
commit25920d6ad61b078a69b6ba401d4d6cd46ce83804 (patch)
treeb4066fc7c1369efe2c7312c16550d8bb5b82f0da /Makefile.objs
parentb9f66d96950b7c10253f9f27b9109df5ff8aa611 (diff)
downloadqemu-25920d6ad61b078a69b6ba401d4d6cd46ce83804.zip
qemu-25920d6ad61b078a69b6ba401d4d6cd46ce83804.tar.gz
qemu-25920d6ad61b078a69b6ba401d4d6cd46ce83804.tar.bz2
Make qemu-config available for tools
To be able to use config files for blkdebug, we need to make these functions available in the tools. This involves moving two functions that can only be built in the context of the emulator. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs
index ed7bbda..69d6879 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -8,7 +8,7 @@ qobject-obj-y += qerror.o
# 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 osdep.o
+block-obj-y += nbd.o block.o aio.o aes.o osdep.o qemu-config.o
block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
@@ -76,7 +76,7 @@ common-obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o
common-obj-y += qemu-char.o savevm.o #aio.o
common-obj-y += msmouse.o ps2.o
common-obj-y += qdev.o qdev-properties.o
-common-obj-y += qemu-config.o block-migration.o
+common-obj-y += block-migration.o
common-obj-$(CONFIG_BRLAPI) += baum.o
common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o