* [Qemu-devel] [PATCH] s390x/kvm: Fix compile error
@ 2014-11-26 10:07 Christian Borntraeger
2014-11-26 10:19 ` Cornelia Huck
2014-11-26 11:10 ` Michael S. Tsirkin
0 siblings, 2 replies; 4+ messages in thread
From: Christian Borntraeger @ 2014-11-26 10:07 UTC (permalink / raw)
To: Peter Maydell
Cc: Michael S. Tsirkin, qemu-devel, Christian Borntraeger,
Jens Freimann, Cornelia Huck, Igor Mammedov
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] s390x/kvm: Fix compile error
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
1 sibling, 1 reply; 4+ messages in thread
From: Cornelia Huck @ 2014-11-26 10:19 UTC (permalink / raw)
To: Peter Maydell
Cc: Christian Borntraeger, Jens Freimann, Michael S. Tsirkin,
qemu-devel, Igor Mammedov
On Wed, 26 Nov 2014 11:07:24 +0100
Christian Borntraeger <borntraeger@de.ibm.com> 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>
> ---
> target-s390x/kvm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Peter, will you pick this up directly?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] s390x/kvm: Fix compile error
2014-11-26 10:19 ` Cornelia Huck
@ 2014-11-26 10:32 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2014-11-26 10:32 UTC (permalink / raw)
To: Cornelia Huck, Peter Maydell
Cc: Christian Borntraeger, Jens Freimann, qemu-devel, Igor Mammedov,
Michael S. Tsirkin
On 26/11/2014 11:19, Cornelia Huck wrote:
> On Wed, 26 Nov 2014 11:07:24 +0100
> Christian Borntraeger <borntraeger@de.ibm.com> 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>
>> ---
>> target-s390x/kvm.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
>
> Peter, will you pick this up directly?
I am sending a pull request shortly and will pick this up.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] s390x/kvm: Fix compile error
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 11:10 ` Michael S. Tsirkin
1 sibling, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2014-11-26 11:10 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Cornelia Huck, Peter Maydell, Jens Freimann, qemu-devel,
Igor Mammedov
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-26 11:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).