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

----------------------------------------------------------------

Queue for Machine Core patches


Igor Mammedov (6):
  nios2: 10m50_devboard: replace cpu_model with cpu_type
  tests: add machine 'none' with -cpu test
  cpu: add CPU_RESOLVING_TYPE macro
  Use cpu_create(type) instead of cpu_init(cpu_model)
  cpu: get rid of unused cpu_init() defines
  cpu: drop unnecessary NULL check and cpu_common_class_by_name()

Wang Xin (1):
  pc: correct misspelled CPU model-id for pc 2.2

 include/hw/boards.h       |   1 -
 include/hw/i386/pc.h      |   2 +-
 include/qom/cpu.h         |  16 +-------
 target/alpha/cpu.h        |   3 +-
 target/arm/cpu.h          |   3 +-
 target/cris/cpu.h         |   3 +-
 target/hppa/cpu.h         |   2 +-
 target/i386/cpu.h         |   3 +-
 target/lm32/cpu.h         |   3 +-
 target/m68k/cpu.h         |   3 +-
 target/microblaze/cpu.h   |   2 +-
 target/mips/cpu.h         |   3 +-
 target/moxie/cpu.h        |   3 +-
 target/nios2/cpu.h        |   2 +-
 target/openrisc/cpu.h     |   3 +-
 target/ppc/cpu.h          |   3 +-
 target/riscv/cpu.h        |   1 +
 target/s390x/cpu.h        |   3 +-
 target/sh4/cpu.h          |   3 +-
 target/sparc/cpu.h        |   5 +--
 target/tilegx/cpu.h       |   2 +-
 target/tricore/cpu.h      |   3 +-
 target/unicore32/cpu.h    |   3 +-
 target/xtensa/cpu.h       |   3 +-
 bsd-user/main.c           |   4 +-
 exec.c                    |  23 +++++++++++
 hw/core/null-machine.c    |   6 +--
 hw/nios2/10m50_devboard.c |   2 +-
 linux-user/main.c         |   8 +++-
 qom/cpu.c                 |  61 +++-------------------------
 target/i386/cpu.c         |   8 +---
 tests/machine-none-test.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++
 vl.c                      |  10 ++---
 tests/Makefile.include    |   2 +
 34 files changed, 173 insertions(+), 130 deletions(-)
 create mode 100644 tests/machine-none-test.c

-- 
2.14.3

On 15 March 2018 at 18:14, Eduardo Habkost <ehabkost@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

thanks
-- PMM

On Fri, Mar 16, 2018 at 07:05:29PM +0000, Peter Maydell wrote:
> On 15 March 2018 at 18:14, Eduardo Habkost <ehabkost@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?

-- 
Eduardo

On Fri, 16 Mar 2018 16:28:54 -0300
Eduardo Habkost <ehabkost@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 <ehabkost@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.

On Mon, Mar 19, 2018 at 04:01:10PM +0100, Igor Mammedov wrote:
> On Fri, 16 Mar 2018 16:28:54 -0300
> Eduardo Habkost <ehabkost@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 <ehabkost@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