[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/19] pc-bios/s390-ccw: Do proper console setup
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 10/19] pc-bios/s390-ccw: Do proper console setup |
Date: |
Mon, 1 Sep 2014 14:54:21 +0200 |
The final newline/return must happen before we reset the sclp via
diag 308.
Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
pc-bios/s390-ccw/bootmap.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index aa1cf80..115d8bb 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -40,11 +40,6 @@ static void jump_to_IPL_2(void)
ResetInfo *current = 0;
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;
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_continue = address & 0x7fffffff;
+ debug_print_int("set IPL addr to", current->ipl_continue);
+
+ /* Ensure the guest output starts fresh */
+ sclp_print("\n");
+
/*
* HACK ALERT.
* We use the load normal reset to keep r15 unchanged. jump_to_IPL_2
--
1.8.4.2
- [Qemu-devel] [PULL 00/19] s390x/kvm: Several updates/fixes/features, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 02/19] s390x/kvm: execute sigp orders on the target vcpu thread, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 01/19] s390x/kvm: run guest triggered resets on the target vcpu thread, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 03/19] s390x/kvm: execute "system reset" cpu resets on the vcpu thread, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 10/19] pc-bios/s390-ccw: Do proper console setup,
Christian Borntraeger <=
- [Qemu-devel] [PULL 09/19] pc-bios/s390-ccw: IPL from DASD with format variations, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 07/19] pc-bios/s390-ccw Improve ECKD informational message, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 04/19] s390x/kvm: execute the first cpu reset on the vcpu thread, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 14/19] s390-virtio: Apply same memory boundaries as virtio-ccw, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 16/19] s390x/gdb: don't touch the cc if tcg is not enabled, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 05/19] pc-bios/s390-ccw: support all virtio block size, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 13/19] virtio-ccw: Include standby memory when calculating storage increment, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 11/19] pc-bios/s390-ccw.img binary update, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 15/19] sclp-s390: Add memory hotplug SCLPs, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 06/19] pc-bios/s390-ccw: handle more ECKD DASD block sizes, Christian Borntraeger, 2014/09/01