diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-01-06 18:48:14 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-02-06 17:24:21 +0100 |
| commit | 6b383c08c46468ecee98ecf71ffd8362e9bd7f42 (patch) | |
| tree | f20fff4be610d7706f5ff24327d05c6a40831ea0 /block/Makefile.objs | |
| parent | a8b10c6ead7f62e8eadbdaf944f371889c3c4c29 (diff) | |
block/dmg: support bzip2 block entry types
This patch adds support for bzip2-compressed block entries as introduced
with OS X 10.4 (source: https://en.wikipedia.org/wiki/Apple_Disk_Image).
It was tested against a 5.2G "OS X Yosemite" installation image which
stores the BLXX block in the XML property list (instead of resource
forks) and has over 5k chunks.
New configure entries are added (--enable-bzip2 / --disable-bzip2) to
control inclusion of bzip2 functionality (which requires linking against
libbz2). The help message suggests that this option is needed for DMG
files, but the tests are generic enough that other parts of QEMU can use
bzip2 if needed.
The identifiers are based on http://newosxbook.com/DMG.html.
The decompression routines are based on the zlib case, but as there is
no way to reset the decompression state (unlike zlib), memory is
allocated and deallocated for every decompression. This should not be
problematic as the decompression takes most of the time and as blocks
are typically about/over 1 MiB in size, only one allocation is done
every 2000 sectors.
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: John Snow <jsnow@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1420566495-13284-12-git-send-email-peter@lekensteyn.nl
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/Makefile.objs')
| -rw-r--r-- | block/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/Makefile.objs b/block/Makefile.objs index 010afad71a..db2933e469 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -37,5 +37,6 @@ gluster.o-libs := $(GLUSTERFS_LIBS) ssh.o-cflags := $(LIBSSH2_CFLAGS) ssh.o-libs := $(LIBSSH2_LIBS) archipelago.o-libs := $(ARCHIPELAGO_LIBS) +dmg.o-libs := $(BZIP2_LIBS) qcow.o-libs := -lz linux-aio.o-libs := -laio |