KVM: s390: Make psw available on all exits, not just a subset
[pandora-kernel.git] / include / linux / kvm.h
index 92045a9..2d241da 100644 (file)
@@ -181,6 +181,11 @@ struct kvm_run {
        __u64 cr8;
        __u64 apic_base;
 
        __u64 cr8;
        __u64 apic_base;
 
+#ifdef __KVM_S390
+       /* the processor status word for s390 */
+       __u64 psw_mask; /* psw upper half */
+       __u64 psw_addr; /* psw lower half */
+#endif
        union {
                /* KVM_EXIT_UNKNOWN */
                struct {
        union {
                /* KVM_EXIT_UNKNOWN */
                struct {
@@ -232,8 +237,6 @@ struct kvm_run {
                /* KVM_EXIT_S390_SIEIC */
                struct {
                        __u8 icptcode;
                /* KVM_EXIT_S390_SIEIC */
                struct {
                        __u8 icptcode;
-                       __u64 mask; /* psw upper half */
-                       __u64 addr; /* psw lower half */
                        __u16 ipa;
                        __u32 ipb;
                } s390_sieic;
                        __u16 ipa;
                        __u32 ipb;
                } s390_sieic;
@@ -492,6 +495,7 @@ struct kvm_ioeventfd {
 #ifdef __KVM_HAVE_VCPU_EVENTS
 #define KVM_CAP_VCPU_EVENTS 41
 #endif
 #ifdef __KVM_HAVE_VCPU_EVENTS
 #define KVM_CAP_VCPU_EVENTS 41
 #endif
+#define KVM_CAP_S390_PSW 42
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
 
 #ifdef KVM_CAP_IRQ_ROUTING