diff options
| author | Peter Maydell | 2016-06-14 14:14:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-14 14:14:55 +0200 |
| commit | d32490ca74c700edc74f0b2f6b7536b52a644739 (patch) | |
| tree | e3c198dc788355b3b97fd0ca7539bfe8c06950ff /linux-headers/linux | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160614' into... (diff) | |
| parent | s390x/kvm: Fixup interrupt type for non-adapter I/O interrupts (diff) | |
| download | qemu-d32490ca74c700edc74f0b2f6b7536b52a644739.tar.gz qemu-d32490ca74c700edc74f0b2f6b7536b52a644739.tar.xz qemu-d32490ca74c700edc74f0b2f6b7536b52a644739.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160614' into staging
More s390x patches, this time mostly dealing with channel I/O:
Bugfixes and cleanups, and dequeue pending interrupts after
machine checks.
# gpg: Signature made Tue 14 Jun 2016 13:09:43 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20160614:
s390x/kvm: Fixup interrupt type for non-adapter I/O interrupts
s390x: Limit s390-ccw machines to 248 CPUs
virtio-ccw: Provide traces for indicator changes
s390x/css: introduce property type for device ids
s390x/css: clear IO irqs when generating IPI CRW
s390x/kvm: add interface for clearing IO irqs
linux-headers: update
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/linux')
| -rw-r--r-- | linux-headers/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 3bae71a874..e60e21ba22 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -865,6 +865,7 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_SPAPR_TCE_64 125 #define KVM_CAP_ARM_PMU_V3 126 #define KVM_CAP_VCPU_ATTRIBUTES 127 +#define KVM_CAP_MAX_VCPU_ID 128 #ifdef KVM_CAP_IRQ_ROUTING |