mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-bios/s390-ccw: Do proper console setup

Browse Source 
The final newline/return must happen before we reset the sclp via
diag 308.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Christian Borntraeger 2014-08-29 11:01:41 +02:00
parent 14f56a2e35
commit 1aa7f4c6aa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc-bios/s390-ccw/bootmap.c
View File

@ -40,11 +40,6 @@ static void jump_to_IPL_2(void)
ResetInfo *current = 0; ResetInfo *current = 0;
void (*ipl)(void) = (void *) (uint64_t) current->ipl_continue; void (*ipl)(void) = (void *) (uint64_t) current->ipl_continue;
debug_print_addr("set IPL addr to", ipl);
/* Ensure the guest output starts fresh */
sclp_print("\n");
*current = save; *current = save;
ipl(); /* should not return */ ipl(); /* should not return */
} }
@ -64,6 +59,11 @@ static void jump_to_IPL_code(uint64_t address)
current->ipl_addr = (uint32_t) (uint64_t) &jump_to_IPL_2; current->ipl_addr = (uint32_t) (uint64_t) &jump_to_IPL_2;
current->ipl_continue = address & 0x7fffffff; current->ipl_continue = address & 0x7fffffff;
debug_print_int("set IPL addr to", current->ipl_continue);
/* Ensure the guest output starts fresh */
sclp_print("\n");
/* /*
* HACK ALERT. * HACK ALERT.
* We use the load normal reset to keep r15 unchanged. jump_to_IPL_2 * We use the load normal reset to keep r15 unchanged. jump_to_IPL_2