diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-13 08:04:31 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-13 08:04:31 -0500 |
| commit | 3cbe19b2e27238caa8b7518182eb674b8169b8df (patch) | |
| tree | 6e13a58ec66a964092b5304d811ab20627723c1f /linux-headers/asm-s390/kvm.h | |
| parent | a602e48958eb70b33415407e6f64bc883e019c37 (diff) | |
| parent | f349c12c0434e29c79ecde89029320c4002f7253 (diff) | |
| download | qemu-3cbe19b2e27238caa8b7518182eb674b8169b8df.tar.gz | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
kvmclock: guest stop notification
kvm: update linux headers
kvm: set gsi_bits and max_gsi correctly
kvm: Drop unused kvm_pit_in_kernel
kvm: allow arbitrarily sized mmio ioeventfd
kvm: Drop redundant kvm_enabled from cpu_thread_is_idle
kvm: add flightrecorder script
Diffstat (limited to 'linux-headers/asm-s390/kvm.h')
| -rw-r--r-- | linux-headers/asm-s390/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index 9acbde4af2..96076676e2 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -44,10 +44,12 @@ struct kvm_guest_debug_arch { #define KVM_SYNC_PREFIX (1UL << 0) #define KVM_SYNC_GPRS (1UL << 1) #define KVM_SYNC_ACRS (1UL << 2) +#define KVM_SYNC_CRS (1UL << 3) /* definition of registers in kvm_run */ struct kvm_sync_regs { __u64 prefix; /* prefix register */ __u64 gprs[16]; /* general purpose registers */ __u32 acrs[16]; /* access registers */ + __u64 crs[16]; /* control registers */ }; #endif |