From patchwork Thu Mar 13 18:44:47 2014 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: 330075 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 8D7312C00CA for ; Fri, 14 Mar 2014 05:45:22 +1100 (EST) Received: from localhost ([::1]:41105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOAd6-0001K4-8Z for incoming@patchwork.ozlabs.org; Thu, 13 Mar 2014 14:45:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOAck-0001HY-Sc for qemu-devel@nongnu.org; Thu, 13 Mar 2014 14:45:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOAcc-00022P-MM for qemu-devel@nongnu.org; Thu, 13 Mar 2014 14:44:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37161 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOAcc-00022D-BT for qemu-devel@nongnu.org; Thu, 13 Mar 2014 14:44:50 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 75BDE75012; Thu, 13 Mar 2014 18:44:49 +0000 (UTC) Message-ID: <5321FC9F.2010601@suse.de> Date: Thu, 13 Mar 2014 19:44:47 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Peter Maydell References: <1394722501-32326-1-git-send-email-afaerber@suse.de> In-Reply-To: X-Enigmail-Version: 1.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.135.220.15 Cc: Igor Mammedov , Eduardo Habkost , QEMU Developers , Anthony Liguori , Christian Borntraeger Subject: Re: [Qemu-devel] [PULL for-2.0-rc0 00/58] QOM CPUState patch queue 2014-03-13 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 13.03.2014 18:10, schrieb Peter Maydell: > On 13 March 2014 14:54, Andreas Färber wrote: >> Hello Peter, >> >> This is my current QOM CPU patch queue. Please pull. >> >> Since this touches on bsd-user code, request to apply the build fix first. >> >> NB: I was only able to test x86/ppc/arm KVM this time; s390x KVM was re-reviewed only. >> >> Regards, >> Andreas >> >> Cc: Peter Maydell >> Cc: Anthony Liguori >> >> Cc: Eduardo Habkost >> Cc: Igor Mammedov >> Cc: Christian Borntraeger >> >> The following changes since commit be86c53c058d75fc3938b1b54f363259f282b3d5: >> >> Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging (2014-03-13 13:19:46 +0000) >> >> are available in the git repository at: >> >> >> git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-2.0 >> >> for you to fetch changes up to 98f11363e7add1e750f76e3d81750348f0470c29: >> >> user-exec: Change exception_action() argument to CPUState (2014-03-13 15:35:04 +0100) > > Fails to compile on systems without CONFIG_INT128 (eg 32 bit host): > > /root/qemu/target-s390x/int_helper.c: In function ‘helper_divu64’: > /root/qemu/target-s390x/int_helper.c:111:9: error: passing argument 1 > of ‘cpu_abort’ from incompatible pointer type [-Werror] > In file included from /root/qemu/include/exec/cpu-all.h:26:0, > from /root/qemu/target-s390x/cpu.h:41, > from /root/qemu/target-s390x/int_helper.c:21: > /root/qemu/include/qom/cpu.h:620:37: note: expected ‘struct CPUState > *’ but argument is of type ‘struct CPUS390XState *’ > cc1: all warnings being treated as errors Thanks for catching that, the following seems to fix: } return ret; git-grep showed no further missed occurrences of cpu_abort(). Will submit v2 once my testing completes. Regards, Andreas diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c index 85e49aa..5ffc5a8 100644 --- a/target-s390x/int_helper.c +++ b/target-s390x/int_helper.c @@ -106,9 +106,10 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al, runtime_exception(env, PGM_FIXPT_DIVIDE, GETPC()); } #else + S390CPU *cpu = s390_env_get_cpu(env); /* 32-bit hosts would need special wrapper functionality - just abort if we encounter such a case; it's very unlikely anyways. */ - cpu_abort(env, "128 -> 64/64 division not implemented\n"); + cpu_abort(CPU(cpu), "128 -> 64/64 division not implemented\n"); #endif