diff options
| author | Peter Maydell | 2016-03-01 14:09:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-01 14:09:55 +0100 |
| commit | 9c279bec754a84c790b70674a5a224379c8dcda2 (patch) | |
| tree | 4493bd78226bb9c9ddbff8e346332e9046caa887 /linux-headers/linux/kvm.h | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20160301-1' in... (diff) | |
| parent | s390x/css: only suspend when enabled by orb (diff) | |
| download | qemu-9c279bec754a84c790b70674a5a224379c8dcda2.tar.gz qemu-9c279bec754a84c790b70674a5a224379c8dcda2.tar.xz qemu-9c279bec754a84c790b70674a5a224379c8dcda2.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160301' into staging
Assorted fixes, cleanups and enhancements.
# gpg: Signature made Tue 01 Mar 2016 11:45:12 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
* remotes/cohuck/tags/s390x-20160301:
s390x/css: only suspend when enabled by orb
MAINTAINERS: Remove entry for hw/s390x/s390-virtio-bus.[ch]
MAINTAINERS: Remove the old s390-virtio machine
s390x/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries
s390x/css: Use static initialization for channel_subsys fields
s390x/css: Allocate channel_subsys statically
s390x/pci: fix reg/dereg irq functions
s390x/css: introduce indicator refcounting interfaces
s390x/virtio: old machine leftovers
watchdog/diag288: avoid race condition on expired watchdog
s390x: remove {kvm_}s390_virtio_irq()
s390x: fix debug statement in trigger_page_fault()
s390x/kvm: sync fprs via kvm_run
linux-headers: update against kvm/next
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/linux/kvm.h')
| -rw-r--r-- | linux-headers/linux/kvm.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 4e20262597..4a56b9ea76 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -541,7 +541,13 @@ struct kvm_s390_pgm_info { __u8 exc_access_id; __u8 per_access_id; __u8 op_access_id; - __u8 pad[3]; +#define KVM_S390_PGM_FLAGS_ILC_VALID 0x01 +#define KVM_S390_PGM_FLAGS_ILC_0 0x02 +#define KVM_S390_PGM_FLAGS_ILC_1 0x04 +#define KVM_S390_PGM_FLAGS_ILC_MASK 0x06 +#define KVM_S390_PGM_FLAGS_NO_REWIND 0x08 + __u8 flags; + __u8 pad[2]; }; struct kvm_s390_prefix_info { @@ -849,6 +855,7 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_SPLIT_IRQCHIP 121 #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122 #define KVM_CAP_HYPERV_SYNIC 123 +#define KVM_CAP_S390_RI 124 #ifdef KVM_CAP_IRQ_ROUTING |