diff options
| author | Greg Kurz | 2016-04-26 15:41:04 +0200 |
|---|---|---|
| committer | David Gibson | 2016-05-27 01:40:23 +0200 |
| commit | 41264b385c2b324fea026204e5de9bef980733b1 (patch) | |
| tree | 2284acef24028c8f0ab0a642dc9516dcc62a8ae7 /include | |
| parent | Added negative check for get_image_size() (diff) | |
| download | qemu-41264b385c2b324fea026204e5de9bef980733b1.tar.gz qemu-41264b385c2b324fea026204e5de9bef980733b1.tar.xz qemu-41264b385c2b324fea026204e5de9bef980733b1.zip | |
PPC/KVM: early validation of vcpu id
The KVM API restricts vcpu ids to be < KVM_CAP_MAX_VCPUS. On PowerPC
targets, depending on the number of threads per core in the host and
in the guest, some topologies do generate higher vcpu ids actually.
When this happens, QEMU bails out with the following error:
kvm_init_vcpu failed: Invalid argument
The KVM_CREATE_VCPU ioctl has several EINVAL return paths, so it is
not possible to fully disambiguate.
This patch adds a check in the code that computes vcpu ids, so that
we can detect the error earlier, and print a friendlier message instead
of calling KVM_CREATE_VCPU with an obviously bogus vcpu id.
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index f9f00e2e56..f357ccde91 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -345,6 +345,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s); int kvm_arch_init_vcpu(CPUState *cpu); +bool kvm_vcpu_id_is_valid(int vcpu_id); + /* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id(CPUState *cpu); |