Re: [Xen-devel] [PATCH 2/2] libxc: add LZ4 decompression support

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 24.09.13 at 12:05, Ian Campbell <Ian.Campbell@xxxxxxxxxx> wrote:
> On Tue, 2013-09-24 at 10:34 +0100, Ian Campbell wrote:
>> I'll give it a go and see what happens...
> 
> gcc [...] -c -o xc_dom_bzimageloader.o xc_dom_bzimageloader.c 
> In file included from ../../xen/common/lz4/decompress.c:40:0,
>                  from xc_dom_bzimageloader.c:595:
> ../../xen/common/lz4/defs.h:26:27: fatal error: asm/unaligned.h: No such 
> file or directory
> compilation terminated.
> make[2]: *** [xc_dom_bzimageloader.o] Error 1
> make[2]: Leaving directory 
> `/local/scratch/ianc/devel/xen.git/stubdom/libxc-x86_64'
> make[1]: *** [build] Error 2
> make[1]: Leaving directory 
> `/local/scratch/ianc/devel/xen.git/stubdom/libxc-x86_64'
> make: *** [libxc-x86_64/libxenctrl.a] Error 2
> make: Leaving directory `/local/scratch/ianc/devel/xen.git/stubdom'
> 
> This incremental hunk fixes it.  xen/common/unlzo.c uses an uglier #if
> 1, but this seems correct to me.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> Feel free to fold it in.

Done, albeit not in the xen/ subtree but instead in
tools/libxc/xc_dom_bzimageloader.c itself. Thanks for helping
out with this!

> --- a/xen/common/lz4/defs.h
> +++ b/xen/common/lz4/defs.h
> @@ -12,6 +12,10 @@
>  #include <asm/byteorder.h>
>  #endif
>  
> +#ifdef __MINIOS__
> +#include <mini-os/byteorder.h>
> +#endif
> +
>  #ifdef __LITTLE_ENDIAN
>  static inline u16 INIT get_unaligned_le16(const void *p)
>  {
> 
> With that and a hack to not inline xc_try_lz4_decode I see the expected
> symbols in stubdom/mini-os-x86_64-grub/mini-os (I've not actually run
> it)
> 
> BTW, I noticed that xc_try_lz4_decode does not prefix its errors with
> "LZ4" like most of the other such functions do.

Just like the LZO code it simply stores a message in a local variable
and has a single point where DOMPRINTF() gets used, and that
single point does have a proper prefix.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel