aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxc/xc_dom_bzimageloader.c
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2011-03-09 16:19:36 +0000
committerJan Beulich <jbeulich@novell.com>2011-03-09 16:19:36 +0000
commit4afea3d65321c40bb8afec833c860f92176bfb42 (patch)
treeb76f727b890374991c101bf807c8f1a0fcabe16e /tools/libxc/xc_dom_bzimageloader.c
parenta1630abae53f89e366eea574d650400347ab5f59 (diff)
downloadxen-4afea3d65321c40bb8afec833c860f92176bfb42.tar.gz
xen-4afea3d65321c40bb8afec833c860f92176bfb42.tar.bz2
xen-4afea3d65321c40bb8afec833c860f92176bfb42.zip
Add DomU xz kernel decompression
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'tools/libxc/xc_dom_bzimageloader.c')
-rw-r--r--tools/libxc/xc_dom_bzimageloader.c84
1 files changed, 61 insertions, 23 deletions
diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c
index d14acbdff7..8559e4c1a9 100644
--- a/tools/libxc/xc_dom_bzimageloader.c
+++ b/tools/libxc/xc_dom_bzimageloader.c
@@ -140,11 +140,10 @@ static int xc_try_bzip2_decode(
#include <lzma.h>
-static int xc_try_lzma_decode(
- struct xc_dom_image *dom, void **blob, size_t *size)
+static int _xc_try_lzma_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size,
+ lzma_stream *stream, lzma_ret ret, const char *what)
{
- lzma_stream stream = LZMA_STREAM_INIT;
- lzma_ret ret;
lzma_action action = LZMA_RUN;
unsigned char *out_buf;
unsigned char *tmp_buf;
@@ -152,10 +151,9 @@ static int xc_try_lzma_decode(
int outsize;
const char *msg;
- ret = lzma_alone_decoder(&stream, 128*1024*1024);
if ( ret != LZMA_OK )
{
- DOMPRINTF("LZMA: Failed to init stream decoder");
+ DOMPRINTF("%s: Failed to init decoder", what);
return -1;
}
@@ -167,32 +165,32 @@ static int xc_try_lzma_decode(
out_buf = malloc(outsize);
if ( out_buf == NULL )
{
- DOMPRINTF("LZMA: Failed to alloc memory");
+ DOMPRINTF("%s: Failed to alloc memory", what);
goto lzma_cleanup;
}
- stream.next_in = dom->kernel_blob;
- stream.avail_in = dom->kernel_size;
+ stream->next_in = dom->kernel_blob;
+ stream->avail_in = dom->kernel_size;
- stream.next_out = out_buf;
- stream.avail_out = dom->kernel_size;
+ stream->next_out = out_buf;
+ stream->avail_out = dom->kernel_size;
for ( ; ; )
{
- ret = lzma_code(&stream, action);
- if ( (stream.avail_out == 0) || (ret != LZMA_OK) )
+ ret = lzma_code(stream, action);
+ if ( (stream->avail_out == 0) || (ret != LZMA_OK) )
{
tmp_buf = realloc(out_buf, outsize * 2);
if ( tmp_buf == NULL )
{
- DOMPRINTF("LZMA: Failed to realloc memory");
+ DOMPRINTF("%s: Failed to realloc memory", what);
free(out_buf);
goto lzma_cleanup;
}
out_buf = tmp_buf;
- stream.next_out = out_buf + outsize;
- stream.avail_out = (outsize * 2) - outsize;
+ stream->next_out = out_buf + outsize;
+ stream->avail_out = (outsize * 2) - outsize;
outsize *= 2;
}
@@ -200,7 +198,7 @@ static int xc_try_lzma_decode(
{
if ( ret == LZMA_STREAM_END )
{
- DOMPRINTF("LZMA: Saw data stream end");
+ DOMPRINTF("%s: Saw data stream end", what);
retval = 0;
break;
}
@@ -236,26 +234,55 @@ static int xc_try_lzma_decode(
msg = "Internal program error (bug)";
break;
}
- DOMPRINTF("%s: LZMA decompression error %s",
- __FUNCTION__, msg);
+ DOMPRINTF("%s: %s decompression error: %s",
+ __FUNCTION__, what, msg);
break;
}
}
- DOMPRINTF("%s: LZMA decompress OK, 0x%zx -> 0x%zx",
- __FUNCTION__, *size, (size_t)stream.total_out);
+ DOMPRINTF("%s: %s decompress OK, 0x%zx -> 0x%zx",
+ __FUNCTION__, what, *size, (size_t)stream->total_out);
*blob = out_buf;
- *size = stream.total_out;
+ *size = stream->total_out;
lzma_cleanup:
- lzma_end(&stream);
+ lzma_end(stream);
return retval;
}
+/* 128 Mb is the minimum size (half-way) documented to work for all inputs. */
+#define LZMA_BLOCK_SIZE (128*1024*1024)
+
+static int xc_try_xz_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ lzma_stream stream = LZMA_STREAM_INIT;
+ lzma_ret ret = lzma_stream_decoder(&stream, LZMA_BLOCK_SIZE, 0);
+
+ return _xc_try_lzma_decode(dom, blob, size, &stream, ret, "XZ");
+}
+
+static int xc_try_lzma_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ lzma_stream stream = LZMA_STREAM_INIT;
+ lzma_ret ret = lzma_alone_decoder(&stream, LZMA_BLOCK_SIZE);
+
+ return _xc_try_lzma_decode(dom, blob, size, &stream, ret, "LZMA");
+}
+
#else /* !defined(HAVE_LZMA) */
+static int xc_try_xz_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ DOMPRINTF("%s: XZ decompress support unavailable",
+ __FUNCTION__);
+ return -1;
+}
+
static int xc_try_lzma_decode(
struct xc_dom_image *dom, void **blob, size_t *size)
{
@@ -557,6 +584,17 @@ static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
return -EINVAL;
}
}
+ else if ( memcmp(dom->kernel_blob, "\3757zXZ", 6) == 0 )
+ {
+ ret = xc_try_xz_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+ if ( ret < 0 )
+ {
+ xc_dom_panic(dom->xch, XC_INVALID_KERNEL,
+ "%s unable to XZ decompress kernel",
+ __FUNCTION__);
+ return -EINVAL;
+ }
+ }
else if ( memcmp(dom->kernel_blob, "\135\000", 2) == 0 )
{
ret = xc_try_lzma_decode(dom, &dom->kernel_blob, &dom->kernel_size);