Re: [Qemu-devel] [PULL v3 00/60] Misc patches for soft freeze

[Philippe Mathieu-Daudé]

On 06/29/2018 03:03 PM, Peter Maydell wrote:
> On 29 June 2018 at 12:05, Paolo Bonzini <address@hidden> wrote:
>> The following changes since commit 4a83bf2f339d4b63ecd5ef48b9816c3b7ee24553:
>>
>>   Merge remote-tracking branch 
>> 'remotes/juanquintela/tags/migration/20180627' into staging (2018-06-28 
>> 15:31:42 +0100)
>>
>> are available in the git repository at:
>>
>>
>>   git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to 28a3cfc10b2e1a34985797357b4aa7558a63d08f:
>>
>>   tests/boot-serial: Do not delete the output file in case of errors 
>> (2018-06-29 13:02:50 +0200)
>>
>> ----------------------------------------------------------------
>> * "info mtree" improvements (Alexey)
>> * fake VPD block limits for SCSI passthrough (Daniel Barboza)
>> * chardev and main loop fixes (Daniel Berrangé, Sergio, Stefan)
>> * help fixes (Eduardo)
>> * pc-dimm refactoring (David)
>> * tests improvements and fixes (Emilio, Thomas)
>> * SVM emulation fixes (Jan)
>> * MemoryRegionCache fix (Eric)
>> * WHPX improvements (Justin)
>> * ESP cleanup (Mark)
>> * -overcommit option (Michael)
>> * qemu-pr-helper fixes (me)
>> * "info pic" improvements for x86 (Peter)
>> * x86 TCG emulation fixes (Richard)
>> * KVM slot handling fix (Shannon)
>> * Next round of deprecation (Thomas)
>> * Windows dump format support (Viktor)
>>
> 
> Hi; looks like this broke the Travis --disable-tcg build:
> https://travis-ci.org/qemu/qemu/jobs/398262491
> 
> In file included from /home/travis/build/qemu/qemu/exec.c:62:0:
> /home/travis/build/qemu/qemu/include/exec/ram_addr.h:96:6: error:
> conflicting types for ‘tb_invalidate_phys_range’
>  void tb_invalidate_phys_range(ram_addr_t start, ram_addr_t end);
>       ^
> In file included from /home/travis/build/qemu/qemu/exec.c:24:0:
> /home/travis/build/qemu/qemu/include/exec/exec-all.h:309:6: note:
> previous declaration of ‘tb_invalidate_phys_range’ was here
>  void tb_invalidate_phys_range(target_ulong start, target_ulong end);
>       ^
> /home/travis/build/qemu/qemu/exec.c:1043:6: error: conflicting types
> for ‘tb_invalidate_phys_addr’
>  void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)
>       ^
> In file included from /home/travis/build/qemu/qemu/exec.c:24:0:
> /home/travis/build/qemu/qemu/include/exec/exec-all.h:308:6: note:
> previous declaration of ‘tb_invalidate_phys_addr’ was here
>  void tb_invalidate_phys_addr(target_ulong addr);
>       ^
> 
> (with apologies for the smartquote damage).
> 
> Could you have a look, please?

I just sent a patch for this:
http://lists.nongnu.org/archive/html/qemu-devel/2018-06/msg09072.html