This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-devel] Re: "x86-64: EFI boot code" breaks 32-bit build

To: "Ian Jackson" <Ian.Jackson@xxxxxxxxxxxxx>
Subject: [Xen-devel] Re: "x86-64: EFI boot code" breaks 32-bit build
From: "Jan Beulich" <JBeulich@xxxxxxxxxx>
Date: Tue, 28 Jun 2011 12:30:44 +0100
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx, keir@xxxxxxx
Delivery-date: Tue, 28 Jun 2011 04:33:36 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <19977.46481.793420.655366@xxxxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <19977.46481.793420.655366@xxxxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
>>> On 28.06.11 at 13:05, Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> wrote:
> cc1: warnings being treated as errors
> mpparse.c: In function 'efi_check_config':
> mpparse.c:669: error: format '%08llx' expects type 'long long unsigned int', 
> but argument 2 has type 'long unsigned int'
> In xen/include/xen/efi.h:
> 23616:     unsigned long mps;          /* MPS table */
> In xen/arch/x86/mpparse.c (line 669):
> 23616:          printk(KERN_INFO "SMP MP-table at %08"PRIx64"\n", efi.mps);
> Should mps be uint64_t ?  What about the other fields in struct efi ?

On 32-bit all code protected by a check of efi_enabled will simply
get compiled out. Hence no point in making the fields uint64_t.
Hence the simplest possible fix would be as below.



Subject: x86-32: compilation fix after c/s 23616:dffcd8b4c197

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -666,7 +666,7 @@ static void __init efi_check_config(
            mpf_checksum((void *)mpf, 16) &&
            (mpf->mpf_specification == 1 || mpf->mpf_specification == 4)) {
                smp_found_config = 1;
-               printk(KERN_INFO "SMP MP-table at %08"PRIx64"\n", efi.mps);
+               printk(KERN_INFO "SMP MP-table at %08lx\n", efi.mps);
                mpf_found = mpf;

Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>