diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:32:45 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:32:46 -0500 |
| commit | bb7d4d82b63bbde06c5584f94bfd9ba3b3e5ff3f (patch) | |
| tree | 2c724450460233fefc322c664a9ed89fb862b8cb /block/Makefile.objs | |
| parent | 5a93d5c2abc719bd44f6c9fbeed88d3cae712606 (diff) | |
| parent | ca0eca91b65c34d6e5f5c77d5c18ed3de5b26139 (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Max Reitz (11) and others
# Via Kevin Wolf
* kwolf/for-anthony: (26 commits)
qemu-iotests: Overlapping cluster allocations
qcow2_check: Mark image consistent
qcow2-refcount: Repair shared refcount blocks
qcow2-refcount: Repair OFLAG_COPIED errors
qcow2-refcount: Move OFLAG_COPIED checks
qcow2: Employ metadata overlap checks
qcow2: Metadata overlap checks
qcow2: Add corrupt bit
qemu-iotests: Snapshotting zero clusters
qcow2-refcount: Snapshot update for zero clusters
option: Add assigned flag to QEMUOptionParameter
gluster: Abort on AIO completion failure
block: Remove old raw driver
switch raw block driver from "raw.o" to "raw_bsd.o"
raw_bsd: register bdrv_raw
raw_bsd: add raw_create_options
raw_bsd: introduce "special members"
raw_bsd: add raw_create()
raw_bsd: emit debug events in bdrv_co_readv() and bdrv_co_writev()
add skeleton for BSD licensed "raw" BlockDriver
...
Message-id: 1378111792-20436-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
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 4cf9aa499f..3bb85b535c 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,4 +1,4 @@ -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 |