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

2016-06-07 Thread Paolo Bonzini
On 07/06/2016 13:13, Peter Maydell wrote: > On 7 June 2016 at 12:03, Paolo Bonzini wrote: >> On 07/06/2016 12:58, Peter Maydell wrote: >>> 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

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

2016-06-07 Thread Peter Maydell
On 7 June 2016 at 12:03, Paolo Bonzini wrote: > On 07/06/2016 12:58, Peter Maydell wrote: >> 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/qem

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

2016-06-07 Thread Paolo Bonzini
On 07/06/2016 12:58, Peter Maydell wrote: > 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 >

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

2016-06-07 Thread Paolo Bonzini
On 07/06/2016 12:39, Peter Maydell wrote: > On 7 June 2016 at 11:24, Peter Maydell wrote: >> On 6 June 2016 at 21:25, Paolo Bonzini wrote: >>> The following changes since commit 76462405809d29bab65a3699686998ba124ab942: >>> >>> Merge remote-tracking branch >>> 'remotes/pmaydell/tags/pull-tar

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

2016-06-07 Thread Peter Maydell
On 7 June 2016 at 11:54, Paolo Bonzini 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: er

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

2016-06-07 Thread Peter Maydell
On 7 June 2016 at 11:24, Peter Maydell wrote: > On 6 June 2016 at 21:25, Paolo Bonzini 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

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

2016-06-07 Thread Peter Maydell
On 6 June 2016 at 21:25, Paolo Bonzini 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

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

2016-06-06 Thread Paolo Bonzini
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