From: "Michael S. Tsirkin" <mst@redhat.com>
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>
Subject: Re: [Qemu-devel] [PATCH] s390x/kvm: Fix compile error
Date: Wed, 26 Nov 2014 13:10:34 +0200 [thread overview]
Message-ID: <20141126111034.GA4222@redhat.com> (raw)
In-Reply-To: <1416996444-45385-1-git-send-email-borntraeger@de.ibm.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
prev parent reply other threads:[~2014-11-26 11:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 10:07 [Qemu-devel] [PATCH] s390x/kvm: Fix compile error Christian Borntraeger
2014-11-26 10:19 ` Cornelia Huck
2014-11-26 10:32 ` Paolo Bonzini
2014-11-26 11:10 ` Michael S. Tsirkin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141126111034.GA4222@redhat.com \
--to=mst@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=imammedo@redhat.com \
--cc=jfrei@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).