On 12/04/2011 07:45 PM, Michael Tokarev wrote: > Actually after trying to do lots of experiments and finally a git > bisection, it turned out that the issue only affects qemu-kvm, not > upstream qemu. Bisection between qemu-kvm 0.15.0 and 1.0 lead to this > commit: > > commit 145e11e840500e04a4d0a624918bb17596be19e9 > Merge: ce967f6 b195043 > Author: Avi Kivity <a...@redhat.com> > Date: Wed Aug 10 12:06:58 2011 +0300 > > Merge commit 'b195043003d90ea4027ea01cc7a6c974ac915108' into > upstream-merge > > * commit 'b195043003d90ea4027ea01cc7a6c974ac915108': (130 commits) > ... > > After which I'm stuck... ;) >
32-on-64 doesn't build on Fedora due to glib2-devel.i686 conflicting with its x86_64 cousin, so I can't reproduce this. Can you try bisecting this further? $ git tag M b195043003d90ea4027ea01cc7a6c974ac915108 $ git bisect start M M^ ... $ git merge --no-commit M^ [build and test] $ git merge --abort (or git checkout -f) $ git bisect [good|bad] if it happens that M^2 was the bad commit, you'll get a merge conflict. In that case do $ git merge --abort $ git merge M (you'll just be testing M again, but it's good to verify) -- error compiling committee.c: too many arguments to function