qcow2: Implement .bdrv_inactivate

[qemu.git] / block / Makefile.objs

diff --git a/block/Makefile.objs b/block/Makefile.objs
index 2fc496ab69105c96f513f066bee7ebfd58d7ecc2..58ef2ef3f29be9befa68f5cbc389194012878e2d 100644 (file)
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -1,26 +1,44 @@
-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 += raw_bsd.o qcow.o vdi.o vmdk.o cloop.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-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o
+block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o
+block-obj-y += quorum.o

 block-obj-y += parallels.o blkdebug.o blkverify.o
 block-obj-y += parallels.o blkdebug.o blkverify.o

-block-obj-y += snapshot.o qapi.o
+block-obj-y += block-backend.o snapshot.o qapi.o

 block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o
 block-obj-$(CONFIG_POSIX) += raw-posix.o
 block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
 block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o
 block-obj-$(CONFIG_POSIX) += raw-posix.o
 block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

+block-obj-y += null.o mirror.o io.o
+block-obj-y += throttle-groups.o

 
 

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

 block-obj-$(CONFIG_LIBISCSI) += iscsi.o
 block-obj-$(CONFIG_LIBISCSI) += iscsi.o

+block-obj-$(CONFIG_LIBNFS) += nfs.o

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

+block-obj-$(CONFIG_ARCHIPELAGO) += archipelago.o

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

-endif
+block-obj-y += accounting.o
+block-obj-y += write-threshold.o

 
 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
 
 common-obj-y += backup.o
 

-$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)
+iscsi.o-cflags     := $(LIBISCSI_CFLAGS)
+iscsi.o-libs       := $(LIBISCSI_LIBS)
+curl.o-cflags      := $(CURL_CFLAGS)
+curl.o-libs        := $(CURL_LIBS)
+rbd.o-cflags       := $(RBD_CFLAGS)
+rbd.o-libs         := $(RBD_LIBS)
+gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
+gluster.o-libs     := $(GLUSTERFS_LIBS)
+ssh.o-cflags       := $(LIBSSH2_CFLAGS)
+ssh.o-libs         := $(LIBSSH2_LIBS)
+archipelago.o-libs := $(ARCHIPELAGO_LIBS)
+block-obj-m        += dmg.o
+dmg.o-libs         := $(BZIP2_LIBS)
+qcow.o-libs        := -lz
+linux-aio.o-libs   := -laio