diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 15:21:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 15:21:28 +0000 |
| commit | 032e95af53159c354ef70fed39b8d93e149b5dc6 (patch) | |
| tree | c5650515c4c4a927f2c6ad7e45ceb6b86bb69f43 /include | |
| parent | 21c84c91f726054672e187112b698aa3d5e181f4 (diff) | |
| parent | 55641213fc81cdfc3bcd56c9e9991faa119201b2 (diff) | |
| download | qemu-032e95af53159c354ef70fed39b8d93e149b5dc6.zip qemu-032e95af53159c354ef70fed39b8d93e149b5dc6.tar.gz qemu-032e95af53159c354ef70fed39b8d93e149b5dc6.tar.bz2 | |
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 <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 269d0ba..31d9c72 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -135,6 +135,7 @@ struct MachineClass { bool rom_file_has_mr; int minimum_page_bits; bool has_hotpluggable_cpus; + int numa_mem_align_shift; HotplugHandler *(*get_hotplug_handler)(MachineState *machine, DeviceState *dev); |