From: Peter Maydell Date: Wed, 20 Sep 2017 16:35:36 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into... X-Git-Tag: qemu-xen-4.11.0-rc1~163 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d3f5433c7b4aa2d59c6de4175743f4126e181aea;p=qemu-xen.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging 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 " # 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 --- d3f5433c7b4aa2d59c6de4175743f4126e181aea