Re: [Xen-devel] [PATCH V7 07/12] xen: Introduce monitor_op domctl

[Tamas K Lengyel <tamas.lengyel@xxxxxxxxxxxx>]

On Thu, Mar 26, 2015 at 12:44 PM, Tim Deegan <tim@xxxxxxx> wrote:
> At 11:13 +0000 on 26 Mar (1427368409), Tim Deegan wrote:
>> At 12:08 +0100 on 26 Mar (1427371713), Tamas K Lengyel wrote:
>> > Thanks, I'll be sending v8 of the series today. Are there any plans to
>> > merge the early parts of the series that have been acked while these
>> > patches at the end receive final touch-ups?
>>
>> Yes, I'm going to apply 0-6 now.
>
> ...by which I meant of course 1-6. :)
>
> Unfortunately, with those applied I get a build failure in the stubdom build:
>
> gcc -isystem /local/scratch/tdeegan/xen.git/stubdom/../extras/mini-os/include 
> -D__MINIOS__ -DHAVE_LIBC -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/../extras/mini-os/include/posix 
> -isystem /local/scratch/tdeegan/xen.git/stubdom/../tools/xenstore/include  
> -isystem /local/scratch/tdeegan/xen.git/stubdom/../extras/mini-os/include/x86 
> -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/../extras/mini-os/include/x86/x86_32 
> -U __linux__ -U __FreeBSD__ -U __sun__ -nostdinc -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/../extras/mini-os/include/posix 
> -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/cross-root-i686/i686-xen-elf/include 
> -isystem /usr/lib/gcc/x86_64-linux-gnu/4.9/include -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/lwip-x86_32/src/include -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/lwip-x86_32/src/include/ipv4 
> -I/local/scratch/tdeegan/xen.git/stubdom/include 
> -I/local/scratch/tdeegan/xen.git/stubdom/../xen/include -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include
>  -D__MINIOS__ -DHAVE_LIBC -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include/posix
>  -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../tools/xenstore/include
>   -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include/x86
>  -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include/x86/x86_32
>  -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include
>  -D__MINIOS__ -DHAVE_LIBC -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include/posix
>  -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../tools/xenstore/include
>   -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include/x86
>  -isystem 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../extras/mini-os/include/x86/x86_32
>   -O1 -fno-omit-frame-pointer  -m32 -march=i686 -m32 -march=i686 -g 
> -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
> -Wdeclaration-after-statement -Wno-unused-but-set-variable 
> -Wno-unused-local-typedefs   -fno-stack-protector -fno-exceptions -O1 
> -fno-omit-frame-pointer  -m32 -march=i686 -m32 -march=i686 -g 
> -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
> -Wdeclaration-after-statement -Wno-unused-but-set-variable 
> -Wno-unused-local-typedefs   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .build.d 
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls 
> -mno-tls-direct-seg-refs  -I../../xen/common/libelf -Werror 
> -Wmissing-prototypes -I. -I./include 
> -I/local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../tools/include 
> -pthread -O1 -fno-omit-frame-pointer  -m32 -march=i686 -m32 -march=i686 -g 
> -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
> -Wdeclaration-after-statement -Wno-unused-but-set-variable 
> -Wno-unused-local-typedefs   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF 
> .xc_mem_paging.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 
> -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  
> -I../../xen/common/libelf -Werror -Wmissing-prototypes -I. -I./include 
> -I/local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../tools/include 
> -pthread -include 
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../tools/config.h  -c 
> -o xc_mem_paging.o xc_mem_paging.c
> xc_mem_paging.c:64:5: error: conflicting types for 'xc_mem_paging_nominate'
>  int xc_mem_paging_nominate(xc_interface *xch, domid_t domain_id, uint64_t 
> gfn)
>      ^
> In file included from xc_private.h:33:0,
>                  from xc_mem_paging.c:24:
> xenctrl.h:2272:5: note: previous declaration of 'xc_mem_paging_nominate' was 
> here
>  int xc_mem_paging_nominate(xc_interface *xch, domid_t domain_id,
>      ^
> xc_mem_paging.c:71:5: error: conflicting types for 'xc_mem_paging_evict'
>  int xc_mem_paging_evict(xc_interface *xch, domid_t domain_id, uint64_t gfn)
>      ^
> In file included from xc_private.h:33:0,
>                  from xc_mem_paging.c:24:
> xenctrl.h:2274:5: note: previous declaration of 'xc_mem_paging_evict' was here
>  int xc_mem_paging_evict(xc_interface *xch, domid_t domain_id, unsigned long 
> gfn);
>      ^
> xc_mem_paging.c:78:5: error: conflicting types for 'xc_mem_paging_prep'
>  int xc_mem_paging_prep(xc_interface *xch, domid_t domain_id, uint64_t gfn)
>      ^
> In file included from xc_private.h:33:0,
>                  from xc_mem_paging.c:24:
> xenctrl.h:2275:5: note: previous declaration of 'xc_mem_paging_prep' was here
>  int xc_mem_paging_prep(xc_interface *xch, domid_t domain_id, unsigned long 
> gfn);
>      ^
> xc_mem_paging.c:85:5: error: conflicting types for 'xc_mem_paging_load'
>  int xc_mem_paging_load(xc_interface *xch, domid_t domain_id,
>      ^
> In file included from xc_private.h:33:0,
>                  from xc_mem_paging.c:24:
> xenctrl.h:2276:5: note: previous declaration of 'xc_mem_paging_load' was here
>  int xc_mem_paging_load(xc_interface *xch, domid_t domain_id,
>      ^
> /local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32/../../tools/Rules.mk:107: 
> recipe for target 'xc_mem_paging.o' failed
> make[3]: *** [xc_mem_paging.o] Error 1
> make[3]: Leaving directory 
> '/local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32'
> Makefile:146: recipe for target 'build' failed
> make[2]: *** [build] Error 2
> make[2]: Leaving directory 
> '/local/scratch/tdeegan/xen.git/stubdom/libxc-x86_32'
> Makefile:344: recipe for target 'libxc-x86_32/libxenctrl.a' failed
> make[1]: *** [libxc-x86_32/libxenctrl.a] Error 2
> make[1]: Leaving directory '/local/scratch/tdeegan/xen.git/stubdom'
> Makefile:104: recipe for target 'install-stubdom' failed
> make: *** [install-stubdom] Error 2
>

OK, bug found - forgot to change the gfn type from unsigned long to
uint64_t in xenctrl.h as well and of course that only causes a problem
on libxc-x86_32 build. Will be sending v8 shortly once my
auto-build-test on Travis finishes without errors.

Tamas

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