From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59312)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XtaUn-0008HR-68
	for qemu-devel@nongnu.org; Wed, 26 Nov 2014 06:10:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XtaUg-0001wE-VG
	for qemu-devel@nongnu.org; Wed, 26 Nov 2014 06:10:53 -0500
Received: from mx1.redhat.com ([209.132.183.28]:37456)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XtaUg-0001wA-Ne
	for qemu-devel@nongnu.org; Wed, 26 Nov 2014 06:10:46 -0500
Date: Wed, 26 Nov 2014 13:10:34 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20141126111034.GA4222@redhat.com>
References: <1416996444-45385-1-git-send-email-borntraeger@de.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1416996444-45385-1-git-send-email-borntraeger@de.ibm.com>
Subject: Re: [Qemu-devel] [PATCH] s390x/kvm: Fix compile error
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Jens Freimann <jfrei@linux.vnet.ibm.com>, qemu-devel <qemu-devel@nongnu.org>, Igor Mammedov <imammedo@redhat.com>

On Wed, Nov 26, 2014 at 11:07:24AM +0100, Christian Borntraeger wrote:
> commit a2b257d6212a "memory: expose alignment used for allocating RAM
> as MemoryRegion API" triggered a compile error on KVM/s390x.
> 
> Fix the prototype and the implementation of legacy_s390_alloc.
> 
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  target-s390x/kvm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index 80fb0aa..5349075 100644
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -110,7 +110,7 @@ static int cap_async_pf;
>  
>  static uint64_t cpu_model_call_cache;
>  
> -static void *legacy_s390_alloc(size_t size);
> +static void *legacy_s390_alloc(size_t size, uint64_t *align);
>  
>  static int kvm_s390_check_clear_cmma(KVMState *s)
>  {
> @@ -545,7 +545,7 @@ int kvm_s390_set_clock(uint8_t *tod_clock_high, uint64_t *tod_clock)
>   * to grow. We also have to use MAP parameters that avoid
>   * read-only mapping of guest pages.
>   */
> -static void *legacy_s390_alloc(size_t size, , uint64_t *align)
> +static void *legacy_s390_alloc(size_t size, uint64_t *align)
>  {
>      void *mem;
>  
> -- 
> 1.9.3