Re: [Qemu-devel] [PULL v2 0/9] Misc changes for 2016-06-06

[Paolo Bonzini]

On 07/06/2016 12:39, Peter Maydell wrote:
> On 7 June 2016 at 11:24, Peter Maydell <address@hidden> wrote:
>> On 6 June 2016 at 21:25, Paolo Bonzini <address@hidden> wrote:
>>> The following changes since commit 76462405809d29bab65a3699686998ba124ab942:
>>>
>>>   Merge remote-tracking branch 
>>> 'remotes/pmaydell/tags/pull-target-arm-20160606-1' into staging (2016-06-06 
>>> 17:02: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 379b954bf85e3d05e6323def1736d3bdea9b2a5c:
>>>
>>>   vnc: list the 'to' parameter of '-vnc' in the qemu man page (2016-06-06 
>>> 19:00:25 +0200)
>>>
>>> ----------------------------------------------------------------
>>> * max-ram-below-4g improvement (Gerd)
>>> * escc fix (xiaoqiang)
>>> * ESP fix (Prasad)
>>> * scsi-disk tweaks/fix (me)
>>> * PKGVERSION improvement (Fam)
>>> * -vnc man improvement (Robert)
>>>
>>> ----------------------------------------------------------------
>>
>> I'm afraid this fails to build on 32-bit ARM:
>>
>> make: Entering directory `/home/petmay01/qemu/build/all-a32'
>> /home/petmay01/qemu/tests/docker/Makefile.include:34: *** unterminated
>> variable reference.  Stop.
>> make: Leaving directory `/home/petmay01/qemu/build/all-a32'
>>
>> No idea why that one's the only failure, because it doesn't seem
>> architecturally related. The patch on list
>> 'docker: Don't use eval trick on Makefile' might help, but I haven't
>> tested that.
> 
> ...and I thought I'd retry as a test, but before I applied that
> patch I get a different failure mode instead:
> 
> In file included from /home/petmay01/qemu/qemu-img.c:25:0:
> ./qemu-version.h:1:0: error: "QEMU_PKGVERSION" redefined [-Werror]
>  #define QEMU_PKGVERSION " (v2.4.0-5677-g0f09cdf-dirty)"
>  ^
> In file included from /home/petmay01/qemu/include/qemu/osdep.h:30:0,
>                  from /home/petmay01/qemu/qemu-img.c:24:
> ./config-host.h:31:0: note: this is the location of the previous definition
>  #define QEMU_PKGVERSION ""
>  ^
> 
> Not sure what is going on there.

Your config-host.h is not being regenerated for some reason.  Just kill
it and it should work.

Paolo