All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit dc622deb authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Paolo Bonzini

s390x/kvm: Fix compile error

commit a2b257d6 "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: default avatarChristian Borntraeger <>
Signed-off-by: default avatarPaolo Bonzini <>
parent f3b37668
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment