Re: [Xen-devel] [PATCH] stubdom: fix compile errors in grub

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2012-10-10 at 15:40 +0100, Olaf Hering wrote:
> # HG changeset patch
> # User Olaf Hering <olaf@xxxxxxxxx>
> # Date 1349880048 -7200
> # Node ID a74e22faa1c90a38345be8fdf333101c07166671
> # Parent  384714804b9b2a9742cc45dffaa43b749b85513b
> stubdom: fix compile errors in grub
> 
> Building xen.rpm in SLES11 started to fail due to these compiler
> warnings:
> 
> [ 1436s] ../grub-upstream/netboot/fsys_tftp.c:213: warning: operation on 
> 'block' may be undefined
> [ 1437s] ../grub-upstream/netboot/main.c:444: warning: operation on 'block' 
> may be undefined
> 
> [ 1234s] E: xen sequence-point ../grub-upstream/netboot/fsys_tftp.c:213
> [ 1234s] E: xen sequence-point ../grub-upstream/netboot/main.c:444
> 
> The reason for this is that the assignment is done twice:
>  tp.u.ack.block = ((uint16_t)( (((uint16_t)((block = prevblock)) & 
> (uint16_t)0x00ffU) << 8) | (((uint16_t)((block = prevblock)) & 
> (uint16_t)0xff00U) >> 8)));
> 
> Fix this package build error by adding another patch for grub, which
> moves the assignment out of the macro usage.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> 
> diff -r 384714804b9b -r a74e22faa1c9 
> stubdom/grub.patches/70compiler_warnings.diff
> --- /dev/null
> +++ b/stubdom/grub.patches/70compiler_warnings.diff
> @@ -0,0 +1,45 @@
> +[ 1436s] ../grub-upstream/netboot/fsys_tftp.c:213: warning: operation on 
> 'block' may be undefined
> +[ 1437s] ../grub-upstream/netboot/main.c:444: warning: operation on 'block' 
> may be undefined
> +
> +[ 1234s] E: xen sequence-point ../grub-upstream/netboot/fsys_tftp.c:213
> +[ 1234s] E: xen sequence-point ../grub-upstream/netboot/main.c:444
> +
> +---
> + netboot/fsys_tftp.c |    5 ++++-
> + netboot/main.c      |    5 ++++-
> + 2 files changed, 8 insertions(+), 2 deletions(-)
> +
> +Index: grub-0.97/netboot/fsys_tftp.c
> +===================================================================
> +--- grub-0.97.orig/netboot/fsys_tftp.c
> ++++ grub-0.97/netboot/fsys_tftp.c
> +@@ -209,8 +209,11 @@ buf_fill (int abort)
> +     break;
> + 
> +       if ((block || bcounter) && (block != prevblock + (unsigned short) 1))
> ++      {
> ++          block = prevblock;
> +     /* Block order should be continuous */
> +-    tp.u.ack.block = htons (block = prevblock);
> ++    tp.u.ack.block = htons (block);

Both here and the other hunk this line should have been pushed in
another level I think? The existing code looks lie a terrible mixture of
tabs and spaces though, and there's no upstream to send this to so:

Acked and applied.




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