From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZNN1-0006R8-96 for qemu-devel@nongnu.org; Mon, 06 May 2013 11:30:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZNMy-0003Bw-6A for qemu-devel@nongnu.org; Mon, 06 May 2013 11:30:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60844 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZNMx-0003BL-Pz for qemu-devel@nongnu.org; Mon, 06 May 2013 11:30:27 -0400 From: Alexander Graf Date: Mon, 6 May 2013 17:30:21 +0200 Message-Id: <1367854224-2354-4-git-send-email-agraf@suse.de> In-Reply-To: <1367854224-2354-1-git-send-email-agraf@suse.de> References: <1367854224-2354-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 3/6] S390: Merging s390_ipl_cpu and s390_ipl_reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Dominik Dingel , anthony@codemonkey.ws, aurelien@aurel32.net From: Dominik Dingel There is no use in have this splitted in two functions. Signed-off-by: Dominik Dingel Signed-off-by: Alexander Graf --- 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