summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2014-11-19 11:08:45 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-11-20 14:58:37 +0000
commit9c7074da5ec64e1fd61df881ab291f75541ff2b0 (patch)
tree4300bf6a1e27788c465293f0439440c88d5297ee /hw
parentff323a6b5468523aab07d376875685ec00385f44 (diff)
downloadqemu-9c7074da5ec64e1fd61df881ab291f75541ff2b0.tar.gz
hw/arm/virt: set stdout-path instead of linux,stdout-path
ePAPR 1.1 defines the stdout-path property, making the os-specific linux,stdout-path property redundant. Change the DT setup for ARM virt to use the generic property - supported by Linux since 3.15. The old QEMU behaviour was not present in any released version of QEMU, and was only added to QEMU after the kernel changed, so this should not break any existing setups. Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> [PMM: add note to commit about the old behaviour never hving been in a released version of QEMU] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/arm/virt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 78f618d3bb..314e55b563 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -389,7 +389,7 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic)
qemu_fdt_setprop(vbi->fdt, nodename, "clock-names",
clocknames, sizeof(clocknames));
- qemu_fdt_setprop_string(vbi->fdt, "/chosen", "linux,stdout-path", nodename);
+ qemu_fdt_setprop_string(vbi->fdt, "/chosen", "stdout-path", nodename);
g_free(nodename);
}