On Mon, Mar 19, 2018 at 04:01:10PM +0100, Igor Mammedov wrote: > On Fri, 16 Mar 2018 16:28:54 -0300 > Eduardo Habkost <ehabk...@redhat.com> wrote: > > > On Fri, Mar 16, 2018 at 07:05:29PM +0000, Peter Maydell wrote: > > > On 15 March 2018 at 18:14, Eduardo Habkost <ehabk...@redhat.com> wrote: > > > > Changes in v2 (v1 was 2018-03-12): > > > > * Fix bsd-user build error > > > > > > > > The following changes since commit > > > > 56e8698ffa8aba9f762f980bc21b5340b006f24b: > > > > > > > > Merge remote-tracking branch > > > > 'remotes/stsquad/tags/pull-travis-speedup-130318-1' into staging > > > > (2018-03-15 14:48:09 +0000) > > > > > > > > are available in the Git repository at: > > > > > > > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request > > > > > > > > for you to fetch changes up to 7cbb6fd8926b9b590c0725b9b7d0a11db6aefd08: > > > > > > > > cpu: drop unnecessary NULL check and cpu_common_class_by_name() > > > > (2018-03-15 14:52:40 -0300) > > > > > > > > ---------------------------------------------------------------- > > > > Machine queue, 2018-03-15 > > > > > > > > > > Hi. This produces several warning messages running make check: > > > > > > WARNING: cpu name for target 'riscv32' isn't defined, add it to cpus_map > > > WARNING: cpu name for target 'riscv64' isn't defined, add it to cpus_map > > > > Ouch, another conflict with the commits that added target/riscv > > after the original series was submitted. :( > > > > I will drop all the patches in this pull request except for the > > only bug fix there ("pc: correct misspelled CPU model-id for pc > > 2.2"). > > > > Igor, can you resubmit the cpu_model/cpu_type series fixing the > > warnings so I can queue it for v2.13? > Fixup should be trivial, I'll post it here as reply to offending patch. > > This kind of tree wide changes tend to break often if not merged > quickly and leaving old infrastructure around till 2.13 doesn't > look like good idea as someone will copy it and queued for 2.13 > tree well be broken again. > So I'd prefer if you'd send fixed up pull request instead of > dropping patches.
I agree with you, but we're past soft freeze and this was the 3rd failing pull request due to the same series. But as we still have 1 day before hard freeze. I will merge your fixup and send a new pull request today -- Eduardo