[PULL,26/27] hw/arm/virt-acpi-build: build SLIT when needed

Message ID	1496337035-30213-27-git-send-email-peter.maydell@linaro.org
State	Accepted
Commit	94a66456f15983f40874eff23a215ba8c74d2bdf
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 18:10:34 +0100 Message-Id: <1496337035-30213-27-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> References: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 26/27] hw/arm/virt-acpi-build: build SLIT when needed Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	target-arm queue \| expand [PULL,00/27] target-arm queue [PULL,01/27] libvixl: Correct build failures on NetBSD [PULL,02/27] load_uboot_image: don't assume a full header read [PULL,03/27] hw/intc/arm_gicv3_cpuif: Fix reset value for VMCR_EL2.VBPR1 [PULL,04/27] hw/intc/arm_gicv3_cpuif: Don't let BPR be set below its minimum [PULL,05/27] hw/intc/arm_gicv3_cpuif: Fix priority masking for NS BPR1 [PULL,06/27] target/arm: clear PMUVER field of AA64DFR0 when vPMU=off [PULL,07/27] arm: Use the mmu_idx we're passed in arm_cpu_do_unaligned_access() [PULL,08/27] arm: Add support for M profile CPUs having different MMU index semantics [PULL,09/27] arm: Use different ARMMMUIdx values for M profile [PULL,10/27] arm: Clean up handling of no-MPU PMSA CPUs [PULL,11/27] arm: Don't clear ARM_FEATURE_PMSA for no-mpu configs [PULL,12/27] arm: Don't let no-MPU PMSA cores write to SCTLR.M [PULL,13/27] arm: Remove unnecessary check on cpu->pmsav7_dregion [PULL,14/27] armv7m: Improve "-d mmu" tracing for PMSAv7 MPU [PULL,15/27] armv7m: Implement M profile default memory map [PULL,16/27] arm: All M profile cores are PMSA [PULL,17/27] armv7m: Classify faults as MemManage or BusFault [PULL,18/27] arm: add MPU support to M profile CPUs [PULL,19/27] arm: Implement HFNMIENA support for M profile MPU [PULL,20/27] aspeed/i2c: improve command handling [PULL,21/27] aspeed/i2c: handle LAST command under the RX command [PULL,22/27] aspeed/i2c: introduce a state machine [PULL,23/27] aspeed: add some I2C devices to the Aspeed machines [PULL,24/27] hw/misc: add a TMP42{1, 2, 3} device model [PULL,25/27] aspeed: add a temp sensor device on I2C bus 3 [PULL,26/27] hw/arm/virt-acpi-build: build SLIT when needed [PULL,27/27] hw/arm/virt: fdt: generate distance-map when needed

Message ID

1496337035-30213-27-git-send-email-peter.maydell@linaro.org

State

Accepted

Commit

94a66456f15983f40874eff23a215ba8c74d2bdf

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Thu,  1 Jun 2017 18:10:34 +0100
Message-Id: <1496337035-30213-27-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org>
References: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL 26/27] hw/arm/virt-acpi-build: build SLIT when
	needed
Precedence: list
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

target-arm queue | expand

Commit Message

Peter Maydell June 1, 2017, 5:10 p.m. UTC

From: Andrew Jones <drjones@redhat.com>


Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org>

Message-id: 20170529173751.3443-2-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/arm/virt-acpi-build.c | 4 ++++
 1 file changed, 4 insertions(+)

-- 
2.7.4

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index e585206..2079828 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -776,6 +776,10 @@  void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
     if (nb_numa_nodes > 0) {
         acpi_add_table(table_offsets, tables_blob);
         build_srat(tables_blob, tables->linker, vms);
+        if (have_numa_distance) {
+            acpi_add_table(table_offsets, tables_blob);
+            build_slit(tables_blob, tables->linker);
+        }
     }
 
     if (its_class_name() && !vmc->no_its) {

[PULL,26/27] hw/arm/virt-acpi-build: build SLIT when needed

Commit Message

Patch