diff options
author | Igor Mammedov <imammedo@redhat.com> | 2014-10-31 16:38:32 +0000 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2014-11-23 12:11:29 +0200 |
commit | b8865591d4d5680b4f766c25ca1db110320b4d15 (patch) | |
tree | 7961f3f9de5c4dd137bebadd335d7bb5375a6e87 /kvm-all.c | |
parent | c409572678936d3ffa8694f5a1dae531c2212e21 (diff) | |
download | qemu-b8865591d4d5680b4f766c25ca1db110320b4d15.zip qemu-b8865591d4d5680b4f766c25ca1db110320b4d15.tar.gz qemu-b8865591d4d5680b4f766c25ca1db110320b4d15.tar.bz2 |
pc: kvm: check if KVM has free memory slots to avoid abort()
When more memory devices are used than available
KVM memory slots, QEMU crashes with:
kvm_alloc_slot: no free slot available
Aborted (core dumped)
Fix this by checking that KVM has a free slot before
attempting to map memory in guest address space.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r-- | kvm-all.c | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -132,7 +132,7 @@ static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_LAST_INFO }; -static KVMSlot *kvm_alloc_slot(KVMState *s) +static KVMSlot *kvm_get_free_slot(KVMState *s) { int i; @@ -142,6 +142,22 @@ static KVMSlot *kvm_alloc_slot(KVMState *s) } } + return NULL; +} + +bool kvm_has_free_slot(MachineState *ms) +{ + return kvm_get_free_slot(KVM_STATE(ms->accelerator)); +} + +static KVMSlot *kvm_alloc_slot(KVMState *s) +{ + KVMSlot *slot = kvm_get_free_slot(s); + + if (slot) { + return slot; + } + fprintf(stderr, "%s: no free slot available\n", __func__); abort(); } |