- xz compression for domU kernels from upstream

Changed files:
    xen-xz.patch -> 1.4
    xen.spec -> 1.104

diff --git a/xen-xz.patch b/xen-xz.patch
index 5b8f35a72f661218322f0839ec31ff7251ab469c..e423b4f8795100341ac79f32ceb05f5771758846 100644 (file)
--- a/xen-xz.patch
+++ b/xen-xz.patch
@@ -3540,3 +3540,172 @@ diff --git a/xen/include/xen/decompress.h b/xen/include/xen/decompress.h
  
  int decompress(void *inbuf, unsigned int len, void *outbuf);
  
+--- a/tools/libxc/xc_dom_bzimageloader.c       2011-10-20 19:05:42.000000000 +0200
++++ b/tools/libxc/xc_dom_bzimageloader.c       2012-03-04 23:34:53.797635804 +0100
+@@ -163,11 +163,10 @@
+ 
+ #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;
+@@ -175,10 +174,9 @@
+     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;
+     }
+ 
+@@ -190,22 +188,22 @@
+     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);
++        ret = lzma_code(stream, action);
+         if ( ret == LZMA_STREAM_END )
+         {
+-            DOMPRINTF("LZMA: Saw data stream end");
++            DOMPRINTF("%s: Saw data stream end", what);
+             retval = 0;
+             break;
+         }
+@@ -242,18 +240,18 @@
+                 msg = "Internal program error (bug)";
+                 break;
+             }
+-            DOMPRINTF("%s: LZMA decompression error %s",
+-                      __FUNCTION__, msg);
++            DOMPRINTF("%s: %s decompression error %s",
++                      __FUNCTION__, what, msg);
+             free(out_buf);
+             goto lzma_cleanup;
+         }
+ 
+-        if ( stream.avail_out == 0 )
++        if ( stream->avail_out == 0 )
+         {
+             /* Protect against output buffer overflow */
+             if ( outsize > INT_MAX / 2 )
+             {
+-                DOMPRINTF("LZMA: output buffer overflow");
++                DOMPRINTF("%s: output buffer overflow", what);
+                 free(out_buf);
+                 goto lzma_cleanup;
+             }
+@@ -261,32 +259,61 @@
+             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;
+         }
+     }
+ 
+-    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)
+ {
+@@ -607,6 +634,17 @@
+                          __FUNCTION__);
+             return -EINVAL;
+         }
++    }
++    else if ( check_magic(dom, "\3757zXZ", 5) )
++    {
++        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 ( check_magic(dom, "\135\000", 2) )
+     {

diff --git a/xen.spec b/xen.spec
index 2ed0e80dbccef16430ffc430a9a5b10a6f14856c..fac9368c75f449dbdd47b26fe5cd320100741475 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -8,7 +8,7 @@ Summary:        Xen - a virtual machine monitor
 Summary(pl.UTF-8):     Xen - monitor maszyny wirtualnej
 Name:          xen
 Version:       4.1.2
-Release:       0.1
+Release:       0.3
 License:       GPL
 Group:         Applications/System
 Source0:       http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz