From patchwork Tue Mar 10 16:23:18 2015 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: 448595 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 021FE1400D5 for ; Wed, 11 Mar 2015 03:24:50 +1100 (AEDT) Received: from localhost ([::1]:50193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVMxc-0005I2-4a for incoming@patchwork.ozlabs.org; Tue, 10 Mar 2015 12:24:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVMwF-00037Q-De for qemu-devel@nongnu.org; Tue, 10 Mar 2015 12:23:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVMwB-0004Y1-V1 for qemu-devel@nongnu.org; Tue, 10 Mar 2015 12:23:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48147 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVMwB-0004Xm-PW; Tue, 10 Mar 2015 12:23:19 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2955BAC9B; Tue, 10 Mar 2015 16:23:19 +0000 (UTC) Message-ID: <54FF1A76.50500@suse.de> Date: Tue, 10 Mar 2015 17:23:18 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE Linux GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Eduardo Habkost References: <1424983069-14080-1-git-send-email-ehabkost@redhat.com> <1424983069-14080-5-git-send-email-ehabkost@redhat.com> <54FF18E5.4020207@suse.de> In-Reply-To: <54FF18E5.4020207@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: Peter Maydell , Jia Liu , Bastian Koppelmann , Anthony Green , Riku Voipio , qemu-devel@nongnu.org, Alexander Graf , Blue Swirl , Max Filippov , Michael Walle , qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini , Guan Xuetao , Leon Alrae , Aurelien Jarno , Richard Henderson Subject: Re: [Qemu-devel] [PATCH 4/4] cpu: Make cpu_init() return QOM object 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 Am 10.03.2015 um 17:16 schrieb Andreas Färber: > Am 26.02.2015 um 21:37 schrieb Eduardo Habkost: >> Instead of making cpu_init() return CPUArchState, return a CPU object. >> > [snip] > > In file included from > /home/andreas/QEMU/qemu-cpu/include/exec/cpu-all.h:26:0, > from /home/andreas/QEMU/qemu-cpu/target-alpha/cpu.h:296, > from /home/andreas/QEMU/qemu-cpu/linux-user/qemu.h:7, > from /home/andreas/QEMU/qemu-cpu/linux-user/main.c:29: > /home/andreas/QEMU/qemu-cpu/linux-user/main.c: In function ‘cpu_copy’: > /home/andreas/QEMU/qemu-cpu/include/qom/cpu.h:60:18: error: > initialization from incompatible pointer type [-Werror] > #define CPU(obj) ((CPUState *)(obj)) > ^ > /home/andreas/QEMU/qemu-cpu/target-alpha/cpu.h:432:29: note: in > expansion of macro ‘CPU’ > #define cpu_init(cpu_model) CPU(cpu_alpha_init(cpu_model)) > ^ > /home/andreas/QEMU/qemu-cpu/linux-user/main.c:3455:29: note: in > expansion of macro ‘cpu_init’ > CPUArchState *new_env = cpu_init(cpu_model); > ^ > cc1: all warnings being treated as errors > /home/andreas/QEMU/qemu-cpu/rules.mak:57: recipe for target > 'linux-user/main.o' failed > make[1]: *** [linux-user/main.o] Error 1 The following fixes it for me: Andreas diff --git a/linux-user/main.c b/linux-user/main.c index dd33665..6bd23af 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3452,8 +3452,8 @@ void init_task_state(TaskState *ts) CPUArchState *cpu_copy(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); - CPUArchState *new_env = cpu_init(cpu_model); - CPUState *new_cpu = ENV_GET_CPU(new_env); + CPUState *new_cpu = cpu_init(cpu_model); + CPUArchState *new_env = cpu->env_ptr; CPUBreakpoint *bp; CPUWatchpoint *wp;