From patchwork Mon Apr 2 17:09:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 150192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D3928B6FA3 for ; Tue, 3 Apr 2012 03:10:30 +1000 (EST) Received: from localhost ([::1]:57636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEklw-00083G-Em for incoming@patchwork.ozlabs.org; Mon, 02 Apr 2012 13:10:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEkli-000812-0d for qemu-devel@nongnu.org; Mon, 02 Apr 2012 13:10:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEkld-0002Qr-5O for qemu-devel@nongnu.org; Mon, 02 Apr 2012 13:10:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44782 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEklc-0002QW-Rz for qemu-devel@nongnu.org; Mon, 02 Apr 2012 13:10:09 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id BADDE92004; Mon, 2 Apr 2012 19:10:07 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 2 Apr 2012 19:09:37 +0200 Message-Id: <1333386578-29412-4-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1333386578-29412-1-git-send-email-afaerber@suse.de> References: <1333386578-29412-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Christian Borntraeger , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH v2 3/4] target-s390x: QOM'ify CPU init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move code from cpu_s390x_init() into an initfn. Signed-off-by: Andreas Färber --- target-s390x/cpu.c | 25 +++++++++++++++++++++++++ target-s390x/cpu.h | 3 +++ target-s390x/helper.c | 21 +++------------------ 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index cae0b18..72ec349 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -45,6 +45,30 @@ static void s390_cpu_reset(CPUState *s) s390_add_running_cpu(env); } +static void s390_cpu_initfn(Object *obj) +{ + S390CPU *cpu = S390_CPU(obj); + CPUS390XState *env = &cpu->env; + static int cpu_num = 0; +#if !defined(CONFIG_USER_ONLY) + struct tm tm; +#endif + + cpu_exec_init(env); +#if !defined(CONFIG_USER_ONLY) + qemu_get_timedate(&tm, 0); + env->tod_offset = TOD_UNIX_EPOCH + + (time2tod(mktimegm(&tm)) * 1000000000ULL); + env->tod_basetime = 0; + env->tod_timer = qemu_new_timer_ns(vm_clock, s390x_tod_timer, env); + env->cpu_timer = qemu_new_timer_ns(vm_clock, s390x_cpu_timer, env); +#endif + env->cpu_num = cpu_num++; + env->ext_index = -1; + + cpu_reset(CPU(cpu)); +} + static void s390_cpu_class_init(ObjectClass *oc, void *data) { S390CPUClass *scc = S390_CPU_CLASS(oc); @@ -58,6 +82,7 @@ static const TypeInfo s390_cpu_type_info = { .name = TYPE_S390_CPU, .parent = TYPE_CPU, .instance_size = sizeof(S390CPU), + .instance_init = s390_cpu_initfn, .abstract = false, .class_size = sizeof(S390CPUClass), .class_init = s390_cpu_class_init, diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index c6ee959..2f3f394 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -288,6 +288,9 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong address, int rw #ifndef CONFIG_USER_ONLY +void s390x_tod_timer(void *opaque); +void s390x_cpu_timer(void *opaque); + int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall); #ifdef CONFIG_KVM diff --git a/target-s390x/helper.c b/target-s390x/helper.c index cd3e8f5..6233f9a 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -51,7 +51,7 @@ #endif #ifndef CONFIG_USER_ONLY -static void s390x_tod_timer(void *opaque) +void s390x_tod_timer(void *opaque) { CPUS390XState *env = opaque; @@ -59,7 +59,7 @@ static void s390x_tod_timer(void *opaque) cpu_interrupt(env, CPU_INTERRUPT_HARD); } -static void s390x_cpu_timer(void *opaque) +void s390x_cpu_timer(void *opaque) { CPUS390XState *env = opaque; @@ -72,32 +72,17 @@ CPUS390XState *cpu_s390x_init(const char *cpu_model) { S390CPU *cpu; CPUS390XState *env; -#if !defined (CONFIG_USER_ONLY) - struct tm tm; -#endif static int inited = 0; - static int cpu_num = 0; cpu = S390_CPU(object_new(TYPE_S390_CPU)); env = &cpu->env; - cpu_exec_init(env); + if (tcg_enabled() && !inited) { inited = 1; s390x_translate_init(); } -#if !defined(CONFIG_USER_ONLY) - qemu_get_timedate(&tm, 0); - env->tod_offset = TOD_UNIX_EPOCH + - (time2tod(mktimegm(&tm)) * 1000000000ULL); - env->tod_basetime = 0; - env->tod_timer = qemu_new_timer_ns(vm_clock, s390x_tod_timer, env); - env->cpu_timer = qemu_new_timer_ns(vm_clock, s390x_cpu_timer, env); -#endif env->cpu_model_str = cpu_model; - env->cpu_num = cpu_num++; - env->ext_index = -1; - cpu_reset(CPU(cpu)); qemu_init_vcpu(env); return env; }