[Qemu-commits] [qemu/qemu] 2ff4f6: machine: properly free device_memory

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2ff4f67cabbefb1842b06611e4f79857fc42925a
      
https://github.com/qemu/qemu/commit/2ff4f67cabbefb1842b06611e4f79857fc42925a
  Author: David Hildenbrand <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  machine: properly free device_memory

Machines might have inititalized device_memory if they support memory
devices, so let's properly free it.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 7747abf114874537e898c60ff863828a4e82201d
      
https://github.com/qemu/qemu/commit/7747abf114874537e898c60ff863828a4e82201d
  Author: Dou Liyang <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  hw/machine: Remove the Zero check of nb_numa_nodes for 
numa_complete_configuration()

Commit 7a3099fc9c5c("numa: postpone options post-processing till 
machine_run_board_init()")
broke the commit 7b8be49d36fc("NUMA: Enable adding NUMA node implicitly").

The machine_run_board_init() doesn't do NUMA setup if nb_numa_nodes=0,
but the numa_complete_configuration need add a new node if memory hotplug
is enabled (slots > 0) even nb_numa_nodes=0.

So, Remove the check for numa_complete_configuration() to fix this.

Fixes 7a3099fc9c5c("numa: postpone options post-processing till 
machine_run_board_init()")
Signed-off-by: Dou Liyang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: ed811bed4acbb3ad5f52b1880fb741a3030d0fa1
      
https://github.com/qemu/qemu/commit/ed811bed4acbb3ad5f52b1880fb741a3030d0fa1
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  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 <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/3379c6cce781...ed811bed4acb
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.