Re: [Qemu-devel] [PATCH 0/4] dump-guest-memory: correct the vmcores

[Laszlo Ersek]

On 08/01/13 16:31, Luiz Capitulino wrote:
> On Thu, 1 Aug 2013 09:41:07 -0400
> Luiz Capitulino <address@hidden> wrote:
> 
>> Applied to the qmp branch, thanks.
> 
> Hmm, it brakes the build. Dropping it from the queue for now:
> 
> /home/lcapitulino/work/src/upstream/qmp-unstable/target-s390x/arch_dump.c:179:5:
>  error: conflicting types for ‘cpu_get_dump_info’
>  int cpu_get_dump_info(ArchDumpInfo *info)
>      ^
> In file included from 
> /home/lcapitulino/work/src/upstream/qmp-unstable/target-s390x/arch_dump.c:17:0:
> /home/lcapitulino/work/src/upstream/qmp-unstable/include/sysemu/dump.h:24:5: 
> note: previous declaration of ‘cpu_get_dump_info’ was here
>  int cpu_get_dump_info(ArchDumpInfo *info,
>      ^
> make[1]: *** [target-s390x/arch_dump.o] Error 1
> make: *** [subdir-s390x-softmmu] Error 2
> make: *** Waiting for unfinished jobs....
> 

My series was based on

  Author: Aurelien Jarno <address@hidden>  2013-07-29 09:03:23
  Committer: Aurelien Jarno <address@hidden>  2013-07-29 09:03:23

      Merge branch 'trivial-patches' of git://git.corpit.ru/qemu

and it compiled then just fine.

"target-s390x/arch_dump.c" was added in

  Author: Ekaterina Tumanova <address@hidden>  2013-07-10 15:26:46
  Committer: Christian Borntraeger <address@hidden>  2013-07-30 16:12:25

      s390: Implement dump-guest-memory support for target s390x

See the commit date: 2013-07-30.

I'll refresh the series.

Laszlo