On 01/07/2016 03:17 PM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> Reviewed-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > --- > include/linux/kvm_host.h | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 5ac775b4dde9..48abf6792286 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -114,12 +114,14 @@ static inline bool is_error_page(struct page *page) > * vcpu->requests bit members > */ > #define KVM_REQ_TLB_FLUSH 0 > -#define KVM_REQ_MIGRATE_TIMER 1 > -#define KVM_REQ_REPORT_TPR_ACCESS 2 > #define KVM_REQ_MMU_RELOAD 3 > -#define KVM_REQ_TRIPLE_FAULT 4 > #define KVM_REQ_PENDING_TIMER 5 > #define KVM_REQ_UNHALT 6 > + > +/* x86-specific requests */ > +#define KVM_REQ_MIGRATE_TIMER 1 > +#define KVM_REQ_REPORT_TPR_ACCESS 2 > +#define KVM_REQ_TRIPLE_FAULT 4 > #define KVM_REQ_MMU_SYNC 7 > #define KVM_REQ_CLOCK_UPDATE 8 > /* 9 is unused */ > @@ -130,14 +132,10 @@ static inline bool is_error_page(struct page *page) > #define KVM_REQ_NMI 14 > #define KVM_REQ_PMU 15 > #define KVM_REQ_PMI 16 > -#define KVM_REQ_WATCHDOG 17 > #define KVM_REQ_MASTERCLOCK_UPDATE 18 > #define KVM_REQ_MCLOCK_INPROGRESS 19 > -#define KVM_REQ_EPR_EXIT 20 > #define KVM_REQ_SCAN_IOAPIC 21 > #define KVM_REQ_GLOBAL_CLOCK_UPDATE 22 > -#define KVM_REQ_ENABLE_IBS 23 > -#define KVM_REQ_DISABLE_IBS 24 > #define KVM_REQ_APIC_PAGE_RELOAD 25 > #define KVM_REQ_SMI 26 > #define KVM_REQ_HV_CRASH 27 > @@ -146,6 +144,14 @@ static inline bool is_error_page(struct page *page) > #define KVM_REQ_HV_EXIT 30 > #define KVM_REQ_HV_STIMER 31 > > +/* PPC-specific requests */ > +#define KVM_REQ_WATCHDOG 17 > +#define KVM_REQ_EPR_EXIT 20 > + > +/* s390-specific requests */ > +#define KVM_REQ_ENABLE_IBS 23 > +#define KVM_REQ_DISABLE_IBS 24 > + > #define KVM_USERSPACE_IRQ_SOURCE_ID 0 > #define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID 1 > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html