[Qemu-commits] [qemu/qemu] 556412: numa, spapr: align default numa node memory size to...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 55641213fc81cdfc3bcd56c9e9991faa119201b2
      
https://github.com/qemu/qemu/commit/55641213fc81cdfc3bcd56c9e9991faa119201b2
  Author: Laurent Vivier <address@hidden>
  Date:   2017-03-22 (Wed, 22 Mar 2017)

  Changed paths:
    M hw/core/machine.c
    M hw/ppc/spapr.c
    M include/hw/boards.h
    M numa.c

  Log Message:
  -----------
  numa,spapr: align default numa node memory size to 256MB

Since commit 224245b ("spapr: Add LMB DR connectors"), NUMA node
memory size must be aligned to 256MB (SPAPR_MEMORY_BLOCK_SIZE).

But when "-numa" option is provided without "mem" parameter,
the memory is equally divided between nodes, but 8MB aligned.
This can be not valid for pseries.

In that case we can have:
$ ./ppc64-softmmu/qemu-system-ppc64 -m 4G -numa node -numa node -numa node
qemu-system-ppc64: Node 0 memory size 0x55000000 is not aligned to 256 MiB

With this patch, we have:
(qemu) info numa
3 nodes
node 0 cpus: 0
node 0 size: 1280 MB
node 1 cpus:
node 1 size: 1280 MB
node 2 cpus:
node 2 size: 1536 MB

Signed-off-by: Laurent Vivier <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 032e95af53159c354ef70fed39b8d93e149b5dc6
      
https://github.com/qemu/qemu/commit/032e95af53159c354ef70fed39b8d93e149b5dc6
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
    M hw/core/machine.c
    M hw/ppc/spapr.c
    M include/hw/boards.h
    M numa.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170323' into 
staging

ppc patch queue for 2017-03-23

Just a single bugfix in this batch.  It's not strictly in ppc code,
though it's for the pseries machine's benefit.  Eduardo suggested it
go through my tree however.

# gpg: Signature made Thu 23 Mar 2017 10:09:17 GMT
# gpg:                using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <address@hidden>"
# gpg:                 aka "David Gibson (kernel.org) <address@hidden>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.9-20170323:
  numa,spapr: align default numa node memory size to 256MB

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/21c84c91f726...032e95af5315