aboutsummaryrefslogtreecommitdiffstats
path: root/xen/common/decompress.c
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-06-15 13:19:33 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-06-15 13:19:33 +0100
commitd371fcc85bac2de69b34a0d28293202a3b33cdef (patch)
tree21331ef473dcf3f0a1482c06ee0a8cb2c3f7f00c /xen/common/decompress.c
parent135259fa862febfd04b98d12acf3ab897aa85312 (diff)
downloadxen-d371fcc85bac2de69b34a0d28293202a3b33cdef.tar.gz
xen-d371fcc85bac2de69b34a0d28293202a3b33cdef.tar.bz2
xen-d371fcc85bac2de69b34a0d28293202a3b33cdef.zip
x86: allow LZO compressed bzImage to be used as Dom0 kernel
... since recently Linux added this as another kernel compression method, and we already have LZO compression in the tree (from tmem), so that only glue logic is needed. Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/common/decompress.c')
-rw-r--r--xen/common/decompress.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/xen/common/decompress.c b/xen/common/decompress.c
index de9950c3a7..87d58d75de 100644
--- a/xen/common/decompress.c
+++ b/xen/common/decompress.c
@@ -23,5 +23,8 @@ int __init decompress(void *inbuf, unsigned int len, void *outbuf)
if ( len >= 2 && !memcmp(inbuf, "\135\000", 2) )
return unlzma(inbuf, len, NULL, NULL, outbuf, NULL, error);
+ if ( len >= 5 && !memcmp(inbuf, "\x89LZO", 5) )
+ return unlzo(inbuf, len, NULL, NULL, outbuf, NULL, error);
+
return 1;
}