From: Christian Borntraeger Date: Wed, 26 Nov 2014 10:07:24 +0000 (+0100) Subject: s390x/kvm: Fix compile error X-Git-Tag: qemu-xen-4.6.0-rc1~49^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dc622deb2d49aac6afa485f9025be8fed440ef3d;p=qemu-upstream-4.6-testing.git s390x/kvm: Fix compile error 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 Cc: Michael S. Tsirkin Signed-off-by: Christian Borntraeger Signed-off-by: Paolo Bonzini --- diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 50709ba6b..2c638ab7b 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -106,7 +106,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { static int cap_sync_regs; static int cap_async_pf; -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) { @@ -404,7 +404,7 @@ int kvm_arch_get_registers(CPUState *cs) * 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;