[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] S390: Merging s390_ipl_cpu and s390_ipl_reset
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 3/6] S390: Merging s390_ipl_cpu and s390_ipl_reset |
Date: |
Mon, 6 May 2013 17:30:21 +0200 |
From: Dominik Dingel <address@hidden>
There is no use in have this splitted in two functions.
Signed-off-by: Dominik Dingel <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
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 cc3cd23..d14c548 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)
--
1.6.0.2
- [Qemu-devel] [PULL 1.5 0/6] s390 patch queue 2013-05-06, Alexander Graf, 2013/05/06
- [Qemu-devel] [PATCH 1/6] S390: BIOS check for file, Alexander Graf, 2013/05/06
- [Qemu-devel] [PATCH 3/6] S390: Merging s390_ipl_cpu and s390_ipl_reset,
Alexander Graf <=
- [Qemu-devel] [PATCH 4/6] S390: Add virtio-blk boot, Alexander Graf, 2013/05/06
- [Qemu-devel] [PATCH 5/6] S390: BIOS boot from given device, Alexander Graf, 2013/05/06
- [Qemu-devel] [PATCH 2/6] S390: BIOS create link to src folder for .img file, Alexander Graf, 2013/05/06
- [Qemu-devel] [PATCH 6/6] s390: update s390-ccw.img, Alexander Graf, 2013/05/06
- Re: [Qemu-devel] [PULL 1.5 0/6] s390 patch queue 2013-05-06, Aurelien Jarno, 2013/05/06