diff options
| author | Dominik Dingel <dingel@linux.vnet.ibm.com> | 2013-04-30 07:15:56 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-05-06 17:30:01 +0200 |
| commit | 2c4c71ee3a904bd07141c6499e5834818e6757f1 (patch) | |
| tree | 9a590051a1f734f37317cac87a2e75bb922ecd83 /hw/s390x | |
| parent | e89e33e12e4185fa056a5d7ae6d2e8e7f5400a20 (diff) | |
| download | qemu-2c4c71ee3a904bd07141c6499e5834818e6757f1.tar.gz qemu-2c4c71ee3a904bd07141c6499e5834818e6757f1.tar.bz2 qemu-2c4c71ee3a904bd07141c6499e5834818e6757f1.zip | |
S390: Merging s390_ipl_cpu and s390_ipl_reset
There is no use in have this splitted in two functions.
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/ipl.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index cc3cd2352b..d14c548d88 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -57,16 +57,6 @@ typedef struct S390IPLState { } S390IPLState; -static void s390_ipl_cpu(uint64_t pswaddr) -{ - S390CPU *cpu = S390_CPU(qemu_get_cpu(0)); - CPUS390XState *env = &cpu->env; - - env->psw.addr = pswaddr; - env->psw.mask = IPL_PSW_MASK; - s390_add_running_cpu(cpu); -} - static int s390_ipl_init(SysBusDevice *dev) { S390IPLState *ipl = S390_IPL(dev); @@ -155,8 +145,12 @@ static Property s390_ipl_properties[] = { static void s390_ipl_reset(DeviceState *dev) { S390IPLState *ipl = S390_IPL(dev); + S390CPU *cpu = S390_CPU(qemu_get_cpu(0)); + CPUS390XState *env = &cpu->env; - s390_ipl_cpu(ipl->start_addr); + env->psw.addr = ipl->start_addr; + env->psw.mask = IPL_PSW_MASK; + s390_add_running_cpu(cpu); } static void s390_ipl_class_init(ObjectClass *klass, void *data) |