memory.c: bugfix - ref counting mismatch in memory_region_find

[qemu.git] / block / Makefile.objs

diff --git a/block/Makefile.objs b/block/Makefile.objs
index 554f429d0534684601492ce0b8e6a525685b5701..f43ecbc044f19bebe3e3527598c9900413c770d5 100644 (file)
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -1,14 +1,26 @@
-block-obj-y += raw.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
+block-obj-y += raw_bsd.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o

 block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o
 block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
 block-obj-y += qed-check.o
 block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o
 block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
 block-obj-y += qed-check.o

-block-obj-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o
-block-obj-$(CONFIG_WIN32) += raw-win32.o
+block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o
+block-obj-y += parallels.o blkdebug.o blkverify.o
+block-obj-y += snapshot.o qapi.o
+block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o

 block-obj-$(CONFIG_POSIX) += raw-posix.o
 block-obj-$(CONFIG_POSIX) += raw-posix.o

+block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
+
+ifeq ($(CONFIG_POSIX),y)
+block-obj-y += nbd.o sheepdog.o

 block-obj-$(CONFIG_LIBISCSI) += iscsi.o
 block-obj-$(CONFIG_CURL) += curl.o
 block-obj-$(CONFIG_RBD) += rbd.o
 block-obj-$(CONFIG_GLUSTERFS) += gluster.o
 block-obj-$(CONFIG_LIBISCSI) += iscsi.o
 block-obj-$(CONFIG_CURL) += curl.o
 block-obj-$(CONFIG_RBD) += rbd.o
 block-obj-$(CONFIG_GLUSTERFS) += gluster.o

+block-obj-$(CONFIG_LIBSSH2) += ssh.o
+endif

 
 common-obj-y += stream.o
 common-obj-y += commit.o
 
 common-obj-y += stream.o
 common-obj-y += commit.o

+common-obj-y += mirror.o
+common-obj-y += backup.o
+
+$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)