diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2012-04-04 15:02:07 +1000 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-15 17:07:19 +0200 |
| commit | 5f2e2ba2625d6fa4ecbc2af86e076c20ab84c171 (patch) | |
| tree | 5e05cd8d51dac60a279db6bdd40af035853c3144 /hw/spapr_rtas.c | |
| parent | 3b768df95a877577a9b8d7ea98166240b017ca84 (diff) | |
| download | qemu-5f2e2ba2625d6fa4ecbc2af86e076c20ab84c171.tar.gz | |
pseries: Consolidate hack for RTAS display-character usage
Currently the pseries machine contains not one but two somewhat ugly hacks
to allow printing of early debug messages before the guest has properly
read the device tree.
First, we special case H_PUT_TERM_CHAR so that a vtermno of 0 (usually
invalid) will look for a suitable vty and use that. This supports Linux's
early debug code which will use H_PUT_TERM_CHAR with vtermno==0 before
reading the device tree. Second, we support the RTAS display-character call.
This takes no vtermno so we assume the address of the default first VTY.
This patch makes things more consistent by folding the second hack into the
first. Now, display-character uses the existing vty_lookup() function to
do the same search for a suitable VTY.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/spapr_rtas.c')
| -rw-r--r-- | hw/spapr_rtas.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c index 480a4ae9e4..ae18595150 100644 --- a/hw/spapr_rtas.c +++ b/hw/spapr_rtas.c @@ -44,8 +44,7 @@ static void rtas_display_character(sPAPREnvironment *spapr, uint32_t nret, target_ulong rets) { uint8_t c = rtas_ld(args, 0); - VIOsPAPRDevice *sdev = spapr_vio_find_by_reg(spapr->vio_bus, - SPAPR_VTY_BASE_ADDRESS); + VIOsPAPRDevice *sdev = vty_lookup(spapr, 0); if (!sdev) { rtas_st(rets, 0, -1); |