diff options
| author | Peter Maydell | 2015-07-05 20:33:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-05 20:33:51 +0200 |
| commit | 63a9294ddc9cf4f2bdcd0179324fedcbb6fae59f (patch) | |
| tree | 5aaa6669c9215fef99588d77490cdc211c044d63 /hw/i386/acpi-build.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150703-1' into... (diff) | |
| parent | numa: API to lookup NUMA node by address (diff) | |
| download | qemu-63a9294ddc9cf4f2bdcd0179324fedcbb6fae59f.tar.gz qemu-63a9294ddc9cf4f2bdcd0179324fedcbb6fae59f.tar.xz qemu-63a9294ddc9cf4f2bdcd0179324fedcbb6fae59f.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging
NUMA queue, 2015-07-03
# gpg: Signature made Fri Jul 3 21:49:58 2015 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/numa-pull-request:
numa: API to lookup NUMA node by address
numa: Store boot memory address range in node_info
numa,pc-dimm: Store pc-dimm memory information in numa_info
pc: Abort if HotplugHandlerClass::plug() fails
pc,pc-dimm: Factor out reusable parts in pc_dimm_plug to a separate routine
pc,pc-dimm: Extract hotplug related fields in PCMachineState to a structure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/acpi-build.c')
| -rw-r--r-- | hw/i386/acpi-build.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 00818b925b..aed811a166 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1509,7 +1509,7 @@ build_srat(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) */ if (hotplugabble_address_space_size) { numamem = acpi_data_push(table_data, sizeof *numamem); - acpi_build_srat_memory(numamem, pcms->hotplug_memory_base, + acpi_build_srat_memory(numamem, pcms->hotplug_memory.base, hotplugabble_address_space_size, 0, MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); |