]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jul 2018 20:31:40 +0000 (21:31 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jul 2018 20:31:40 +0000 (21:31 +0100)
commited811bed4acbb3ad5f52b1880fb741a3030d0fa1
treef08395f0f0f7fbc317c87ee1bea0cee9c861fd79
parent3379c6cce7814b3371b66efc13c1bef3088ea9cd
parent7747abf114874537e898c60ff863828a4e82201d
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging

Machine/NUMA fixes for -rc0

* Properly free device_memory at machine_finalize()
* Fix implicit NUMA initialization regression (for machines with
  auto_enable_numa_with_memhp=true)

# gpg: Signature made Mon 09 Jul 2018 18:40:38 BST
# gpg:                using RSA key 2807936F984DC5A6
# 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:
  hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration()
  machine: properly free device_memory

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