mbox

[PULL,v2,00/29] Machine and x86 queue, 2019-06-28

Message ID 20190628184742.5961-1-ehabkost@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

git://github.com/ehabkost/qemu.git tags/machine-next-pull-request

Message

Eduardo Habkost June 28, 2019, 6:47 p.m. UTC
Changes v1 -> v2:
* Fix s390x build failure

The following changes since commit 474f3938d79ab36b9231c9ad3b5a9314c2aeacde:

  Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-21-2019' into staging (2019-06-21 15:40:50 +0100)

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 b701bfd0634f24551449856cdc56fd13f35bd1f6:

  vl.c: Add -smp, dies=* command line support and update doc (2019-06-28 15:34:12 -0300)

----------------------------------------------------------------
Machine and x86 queue, 2019-06-28

* CPU die topology support (Like Xu)
* Deprecation of features (Igor Mammedov):
  * 'mem' parameter of '-numa node' option
  * implict memory distribution between NUMA nodes
  * deprecate -mem-path fallback to anonymous RAM
* Other i386 fixes

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

Queue for Machine Core patches


Alex Bennée (1):
  target/i386: fix feature check in hyperv-stub.c

Eduardo Habkost (4):
  hppa: Delete unused hppa_cpu_list() function
  i386: Don't print warning if phys-bits was set automatically
  i386: Fix signedness of hyperv_spinlock_attempts
  i386: Remove unused host_cpudef variable

Igor Mammedov (5):
  pc: fix possible NULL pointer dereference in
    pc_machine_get_device_memory_region_size()
  machine: show if CLI option '-numa node,mem' is supported in QAPI
    schema
  numa: deprecate 'mem' parameter of '-numa node' option
  numa: deprecate implict memory distribution between nodes
  deprecate -mem-path fallback to anonymous RAM

Like Xu (17):
  hw/boards: Add struct CpuTopology to MachineState
  machine: Refactor smp-related call chains to pass MachineState
  general: Replace global smp variables with smp machine properties
  hw/ppc: Replace global smp variables with machine smp properties
  hw/riscv: Replace global smp variables with machine smp properties
  hw/s390x: Replace global smp variables with machine smp properties
  hw/i386: Replace global smp variables with machine smp properties
  hw/arm: Replace global smp variables with machine smp properties
  hw: Replace global smp variables with MachineState for all remaining
    archs
  vl.c: Replace smp global variables with smp machine properties
  i386: Add die-level cpu topology to x86CPU on PCMachine
  hw/i386: Adjust nr_dies with configured smp_dies for PCMachine
  i386/cpu: Consolidate die-id validity in smp context
  i386: Update new x86_apicid parsing rules with die_offset support
  target/i386: Add CPUID.1F generation support for multi-dies PCMachine
  machine: Refactor smp_parse() in vl.c as MachineClass::smp_parse()
  vl.c: Add -smp, dies=* command line support and update doc

Roman Kagan (1):
  i386: make 'hv-spinlocks' a regular uint32 property

Wei Yang (1):
  x86/cpu: use FeatureWordArray to define filtered_features

 qapi/misc.json               |  11 ++-
 include/hw/boards.h          |  27 +++++-
 include/hw/firmware/smbios.h |   5 +-
 include/hw/i386/pc.h         |   5 +-
 include/hw/i386/topology.h   |  76 +++++++++++----
 target/hppa/cpu.h            |   2 -
 target/i386/cpu.h            |   8 +-
 accel/kvm/kvm-all.c          |   4 +-
 backends/hostmem.c           |   6 +-
 cpus.c                       |   6 +-
 exec.c                       |   3 +-
 gdbstub.c                    |   4 +
 hw/alpha/dp264.c             |   1 +
 hw/arm/fsl-imx6.c            |   6 +-
 hw/arm/fsl-imx6ul.c          |   6 +-
 hw/arm/fsl-imx7.c            |   7 +-
 hw/arm/highbank.c            |   1 +
 hw/arm/mcimx6ul-evk.c        |   2 +-
 hw/arm/mcimx7d-sabre.c       |   2 +-
 hw/arm/raspi.c               |   4 +-
 hw/arm/realview.c            |   1 +
 hw/arm/sabrelite.c           |   2 +-
 hw/arm/vexpress.c            |  16 +--
 hw/arm/virt.c                |  11 ++-
 hw/arm/xlnx-zynqmp.c         |  16 +--
 hw/core/machine.c            |  88 +++++++++++++++++
 hw/cpu/core.c                |   4 +-
 hw/hppa/machine.c            |   4 +-
 hw/i386/acpi-build.c         |  13 ++-
 hw/i386/kvmvapic.c           |   7 +-
 hw/i386/pc.c                 | 183 +++++++++++++++++++++++++++++------
 hw/i386/xen/xen-hvm.c        |   4 +
 hw/mips/boston.c             |   2 +-
 hw/mips/mips_malta.c         |  24 ++---
 hw/openrisc/openrisc_sim.c   |   1 +
 hw/ppc/e500.c                |   3 +
 hw/ppc/mac_newworld.c        |   3 +-
 hw/ppc/mac_oldworld.c        |   3 +-
 hw/ppc/pnv.c                 |   9 +-
 hw/ppc/prep.c                |   4 +-
 hw/ppc/spapr.c               |  38 ++++++--
 hw/ppc/spapr_rtas.c          |   4 +-
 hw/riscv/sifive_e.c          |   6 +-
 hw/riscv/sifive_plic.c       |   3 +
 hw/riscv/sifive_u.c          |   6 +-
 hw/riscv/spike.c             |   3 +
 hw/riscv/virt.c              |   1 +
 hw/s390x/s390-virtio-ccw.c   |   9 +-
 hw/s390x/sclp.c              |   2 +-
 hw/smbios/smbios.c           |  26 ++---
 hw/sparc/sun4m.c             |   2 +
 hw/sparc64/sun4u.c           |   4 +-
 hw/xtensa/sim.c              |   2 +-
 hw/xtensa/xtfpga.c           |   1 +
 migration/postcopy-ram.c     |   8 +-
 monitor/hmp-cmds.c           |   3 +
 monitor/qmp-cmds.c           |   2 +-
 numa.c                       |  12 ++-
 target/arm/cpu.c             |   8 +-
 target/hppa/cpu.c            |  17 ----
 target/i386/cpu.c            | 130 +++++++++++++------------
 target/i386/hyperv-stub.c    |   2 +-
 target/i386/kvm.c            |  12 +++
 target/openrisc/sys_helper.c |   6 +-
 target/s390x/cpu.c           |   3 +
 target/s390x/excp_helper.c   |   5 +
 target/s390x/kvm.c           |  10 +-
 tcg/tcg.c                    |  13 ++-
 tests/test-x86-cpuid.c       |  84 ++++++++--------
 vl.c                         |  97 ++++---------------
 qemu-deprecated.texi         |  33 +++++++
 qemu-options.hx              |  17 ++--
 72 files changed, 779 insertions(+), 374 deletions(-)

Comments

Peter Maydell July 2, 2019, 10:48 a.m. UTC | #1
On Fri, 28 Jun 2019 at 19:47, Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> Changes v1 -> v2:
> * Fix s390x build failure
>
> The following changes since commit 474f3938d79ab36b9231c9ad3b5a9314c2aeacde:
>
>   Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-21-2019' into staging (2019-06-21 15:40:50 +0100)
>
> 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 b701bfd0634f24551449856cdc56fd13f35bd1f6:
>
>   vl.c: Add -smp, dies=* command line support and update doc (2019-06-28 15:34:12 -0300)
>
> ----------------------------------------------------------------
> Machine and x86 queue, 2019-06-28
>
> * CPU die topology support (Like Xu)
> * Deprecation of features (Igor Mammedov):
>   * 'mem' parameter of '-numa node' option
>   * implict memory distribution between NUMA nodes
>   * deprecate -mem-path fallback to anonymous RAM
> * Other i386 fixes

Hi. This fills my build logs with warnings during 'make check':

qemu-system-i386: warning: Default splitting of RAM between nodes is
deprecated, Use '-numa node,memdev' to explictly define RAM allocation
per node
qemu-system-i386: warning: Default splitting of RAM between nodes is
deprecated, Use '-numa node,memdev' to explictly define RAM allocation
per node
qemu-system-i386: -numa node,mem=128: warning: Parameter -numa
node,mem is deprecated, use -numa node,memdev instead
qemu-system-i386: -numa node,mem=32M,nodeid=0: warning: Parameter
-numa node,mem is deprecated, use -numa node,memdev instead
qemu-system-i386: -numa node,mem=32M,nodeid=1: warning: Parameter
-numa node,mem is deprecated, use -numa node,memdev instead
qemu-system-i386: -numa node,mem=32M,nodeid=2: warning: Parameter
-numa node,mem is deprecated, use -numa node,memdev instead
qemu-system-i386: -numa node,mem=32M,nodeid=3: warning: Parameter
-numa node,mem is deprecated, use -numa node,memdev instead
[etc etc for hundreds of instances]

Can you either fix the tests not to warn or arrange for the warnings
to be suppressed, please?

thanks
-- PMM
Igor Mammedov July 2, 2019, 11:44 a.m. UTC | #2
On Tue, 2 Jul 2019 11:48:01 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> On Fri, 28 Jun 2019 at 19:47, Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> > Changes v1 -> v2:
> > * Fix s390x build failure
> >
> > The following changes since commit 474f3938d79ab36b9231c9ad3b5a9314c2aeacde:
> >
> >   Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-21-2019' into staging (2019-06-21 15:40:50 +0100)
> >
> > 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 b701bfd0634f24551449856cdc56fd13f35bd1f6:
> >
> >   vl.c: Add -smp, dies=* command line support and update doc (2019-06-28 15:34:12 -0300)
> >
> > ----------------------------------------------------------------
> > Machine and x86 queue, 2019-06-28
> >
> > * CPU die topology support (Like Xu)
> > * Deprecation of features (Igor Mammedov):
> >   * 'mem' parameter of '-numa node' option
> >   * implict memory distribution between NUMA nodes
> >   * deprecate -mem-path fallback to anonymous RAM
> > * Other i386 fixes  
> 
> Hi. This fills my build logs with warnings during 'make check':
> 
> qemu-system-i386: warning: Default splitting of RAM between nodes is
> deprecated, Use '-numa node,memdev' to explictly define RAM allocation
> per node
> qemu-system-i386: warning: Default splitting of RAM between nodes is
> deprecated, Use '-numa node,memdev' to explictly define RAM allocation
> per node
> qemu-system-i386: -numa node,mem=128: warning: Parameter -numa
> node,mem is deprecated, use -numa node,memdev instead
> qemu-system-i386: -numa node,mem=32M,nodeid=0: warning: Parameter
> -numa node,mem is deprecated, use -numa node,memdev instead
> qemu-system-i386: -numa node,mem=32M,nodeid=1: warning: Parameter
> -numa node,mem is deprecated, use -numa node,memdev instead
> qemu-system-i386: -numa node,mem=32M,nodeid=2: warning: Parameter
> -numa node,mem is deprecated, use -numa node,memdev instead
> qemu-system-i386: -numa node,mem=32M,nodeid=3: warning: Parameter
> -numa node,mem is deprecated, use -numa node,memdev instead
> [etc etc for hundreds of instances]
> 
> Can you either fix the tests not to warn or arrange for the warnings
> to be suppressed, please?
My bad,
 I'll prepare a patch to fix tests shortly

> 
> thanks
> -- PMM