diff options
| author | Anthony Liguori | 2013-11-13 20:47:44 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-11-13 20:47:44 +0100 |
| commit | deb0f500651317863922964c87b4fa64eecdbd73 (patch) | |
| tree | f67b4c5eabb590c5a51b64796cdb19e1dce07847 /block/Makefile.objs | |
| parent | Merge remote-tracking branch 'filippov/tags/20131108-xtensa' into staging (diff) | |
| parent | block: Round up total_sectors (diff) | |
| download | qemu-deb0f500651317863922964c87b4fa64eecdbd73.tar.gz qemu-deb0f500651317863922964c87b4fa64eecdbd73.tar.xz qemu-deb0f500651317863922964c87b4fa64eecdbd73.zip | |
Merge remote-tracking branch 'stefanha/block' into staging
# By Jeff Cody (26) and others
# Via Stefan Hajnoczi
* stefanha/block: (37 commits)
block: Round up total_sectors
block: vhdx qemu-iotest - log replay of data sector
block: qemu-iotests for vhdx, add write test support
block: vhdx - update _make_test_img() to filter out vhdx options
block: vhdx - add .bdrv_create() support
block: vhdx - fix comment typos in header, fix incorrect struct fields
block: vhdx - break out code operations to functions
block: vhdx - move more endian translations to vhdx-endian.c
block: vhdx - remove BAT file offset bit shifting
block: vhdx write support
block: vhdx - add log write support
block: vhdx - add region overlap detection for image files
block: vhdx - log parsing, replay, and flush support
block: vhdx code movement - move vhdx_close() above vhdx_open()
block: vhdx - update log guid in header, and first write tracker
block: vhdx - break endian translation functions out
block: vhdx - log support struct and defines
block: vhdx code movement - VHDXMetadataEntries and BDRVVHDXState to header.
block: vhdx - add header update capability.
block: vhdx - minor comments and typo correction.
...
Message-id: 1383905551-16411-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'block/Makefile.objs')
| -rw-r--r-- | block/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile.objs b/block/Makefile.objs index 3bb85b535c..f43ecbc044 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -2,7 +2,7 @@ block-obj-y += raw_bsd.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o v 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 += vhdx.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 |