Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into...

Machine/CPU/NUMA queue, 2017-09-19

# gpg: Signature made Tue 19 Sep 2017 21:17:01 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  MAINTAINERS: Update git URLs for my trees
  hw/acpi-build: Fix SRAT memory building in case of node 0 without RAM
  NUMA: Replace MAX_NODES with nb_numa_nodes in for loop
  numa: cpu: calculate/set default node-ids after all -numa CLI options are parsed
  arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly
  pc: use generic cpu_model parsing
  vl.c: convert cpu_model to cpu type and set of global properties before machine_init()
  cpu: make cpu_generic_init() abort QEMU on error
  qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts
  hostmem-file: Add "discard-data" option
  osdep: Define QEMU_MADV_REMOVE
  vl: Clean up user-creatable objects when exiting

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc MAINTAINERS
Simple merge

diff --cc hw/arm/vexpress.c
Simple merge

diff --cc hw/i386/acpi-build.c
Simple merge

diff --cc hw/i386/pc.c
Simple merge

diff --cc hw/mips/mips_malta.c
Simple merge

diff --cc hw/mips/mips_r4k.c
Simple merge

diff --cc include/qemu/osdep.h
Simple merge

diff --cc include/qom/cpu.h
Simple merge

diff --cc target/i386/cpu.c
Simple merge

diff --cc target/i386/cpu.h
Simple merge