aboutsummaryrefslogtreecommitdiff
path: root/hw/spapr.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2011-04-19 11:54:52 +1000
committerAlexander Graf <agraf@suse.de>2011-05-09 22:31:37 +0200
commitb4a78527359a4540d84d4cdf629d01cbb262f698 (patch)
tree58a0c7b70416c69507a52f42d8c4f878d9587dea /hw/spapr.c
parent5d73dd66e46f4aff784d15d0e869813dc4b1029a (diff)
downloadqemu-b4a78527359a4540d84d4cdf629d01cbb262f698.zip
qemu-b4a78527359a4540d84d4cdf629d01cbb262f698.tar.gz
qemu-b4a78527359a4540d84d4cdf629d01cbb262f698.tar.bz2
Place pseries vty devices at addresses more similar to existing machines
Currently the qemu pseries machine numbers its virtual serial devices from 0. However, existing pSeries machines running pHyp number them from 0x30000000. In theory these indices are arbitrary, since everything necessary for the kernel to find them is advertised in the device tree. However the debian installer, at least, incorrectly looks for a device named vty@30... to determine whether to use the hypervisor console. Therefore this patch moves the numbers we use to match the existing pHyp practice, in order to workaround broken userspace apps of this type. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/spapr.c')
-rw-r--r--hw/spapr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/spapr.c b/hw/spapr.c
index 884c667..109b774 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -362,8 +362,9 @@ static void ppc_spapr_init(ram_addr_t ram_size,
for (i = 0; i < MAX_SERIAL_PORTS; i++, irq++) {
if (serial_hds[i]) {
- spapr_vty_create(spapr->vio_bus, i, serial_hds[i],
- xics_find_qirq(spapr->icp, irq), irq);
+ spapr_vty_create(spapr->vio_bus, SPAPR_VTY_BASE_ADDRESS + i,
+ serial_hds[i], xics_find_qirq(spapr->icp, irq),
+ irq);
}
}