ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390-ccw.img: replace while loop with a disabled wait on s390 bios 

dont waste cpu power on an error condition. Lets stop the guest
with a disabled wait.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Christian Borntraeger 2013-04-23 01:23:02 +00:00 committed by Alexander Graf
parent b462fcd57c
commit 7f61cbc108
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc-bios/s390-ccw/main.c
View File

@ -16,6 +16,7 @@ char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
void virtio_panic(const char *string) void virtio_panic(const char *string)
{ {
sclp_print(string); sclp_print(string);
disabled_wait();
while (1) { } while (1) { }
} }
@ -52,5 +53,6 @@ int main(void)
virtio_setup(); virtio_setup();
if (zipl_load() < 0) if (zipl_load() < 0)
sclp_print("Failed to load OS from hard disk\n"); sclp_print("Failed to load OS from hard disk\n");
disabled_wait();
while (1) { } while (1) { }
} }

3
pc-bios/s390-ccw/s390-ccw.h
View File

@ -45,6 +45,9 @@ typedef unsigned long long __u64;
#include "cio.h" #include "cio.h"
/* start.s */
void disabled_wait(void);
/* main.c */ /* main.c */
void virtio_panic(const char *string); void virtio_panic(const char *string);

15
pc-bios/s390-ccw/start.S
View File

@ -3,6 +3,7 @@
* into the pc-bios directory of qemu. * into the pc-bios directory of qemu.
* *
* Copyright (c) 2013 Alexander Graf <agraf@suse.de> * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
* Copyright 2013 IBM Corp.
* *
* This work is licensed under the terms of the GNU GPL, version 2 or (at * This work is licensed under the terms of the GNU GPL, version 2 or (at
* your option) any later version. See the COPYING file in the top-level * your option) any later version. See the COPYING file in the top-level
@ -14,3 +15,17 @@ _start:
larl %r15, stack + 0x8000 /* Set up stack */ larl %r15, stack + 0x8000 /* Set up stack */
j main /* And call C */ j main /* And call C */
/*
* void disabled_wait(void)
*
* stops the current guest cpu.
*/
.globl disabled_wait
disabled_wait:
larl %r1,disabled_wait_psw
lpswe 0(%r1)
.align 8
disabled_wait_psw:
.quad 0x0002000180000000,0x0000000000000000