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 <imamm...@redhat.com> > Cc: Michael S. Tsirkin <m...@redhat.com> > Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <m...@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