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

[Peter Maydell]

On 7 June 2016 at 11:54, Paolo Bonzini <address@hidden> wrote:
> On 07/06/2016 12:39, Peter Maydell wrote:
>> ...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.

Worse, when I revert this merge attempt and do a build on the previously
working master, it fails (all trees, all configs):

/home/pm215/qemu/qemu-img.c: In function ‘help’:
/home/pm215/qemu/qemu-img.c:43:59: error: expected ‘,’ or ‘;’ before
‘QEMU_PKGVERSION’
 #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
                                                           ^
/home/pm215/qemu/qemu-img.c:89:12: note: in expansion of macro
‘QEMU_IMG_VERSION’
            QEMU_IMG_VERSION
            ^
/home/pm215/qemu/qemu-img.c: In function ‘main’:
/home/pm215/qemu/qemu-img.c:43:59: error: expected ‘)’ before ‘QEMU_PKGVERSION’
 #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
                                                           ^
/home/pm215/qemu/qemu-img.c:3520:16: note: in expansion of macro
‘QEMU_IMG_VERSION’
         printf(QEMU_IMG_VERSION);
                ^

The change is badly broken somehow.

thanks
-- PMM