diff options
| author | Peter Maydell | 2017-10-03 17:27:24 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-03 17:27:24 +0200 |
| commit | d147f7e815f97cb477e223586bcb80c316ae10ea (patch) | |
| tree | 0f3c63f73bbfa50deafd9fca0a73d9e76597146a /linux-headers/asm-s390/kvm.h | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-10-02' into ... (diff) | |
| parent | kvmclock: use the updated system_timer_msr (diff) | |
| download | qemu-d147f7e815f97cb477e223586bcb80c316ae10ea.tar.gz qemu-d147f7e815f97cb477e223586bcb80c316ae10ea.tar.xz qemu-d147f7e815f97cb477e223586bcb80c316ae10ea.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* iothread bugfix (Eduardo)
* Linux headers sync (Dave)
* .gitignore fix (Eric)
* KVM capability check fixes (Greg)
* kvmclock fix (Jim)
# gpg: Signature made Mon 02 Oct 2017 14:31:09 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
kvmclock: use the updated system_timer_msr
kvm: check KVM_CAP_NR_VCPUS with kvm_vm_check_extension()
kvm: check KVM_CAP_SYNC_MMU with kvm_vm_check_extension()
linux-headers: sync against v4.14-rc1
iothread: Make iothread_stop() idempotent
scsi: Ignore executable for in-tree builds
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/asm-s390/kvm.h')
| -rw-r--r-- | linux-headers/asm-s390/kvm.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index 8387d71c7e..7b750ef7ee 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -88,6 +88,12 @@ struct kvm_s390_io_adapter_req { /* kvm attributes for KVM_S390_VM_TOD */ #define KVM_S390_VM_TOD_LOW 0 #define KVM_S390_VM_TOD_HIGH 1 +#define KVM_S390_VM_TOD_EXT 2 + +struct kvm_s390_vm_tod_clock { + __u8 epoch_idx; + __u64 tod; +}; /* kvm attributes for KVM_S390_VM_CPU_MODEL */ /* processor related attributes are r/w */ |