| Message ID | 1363862964-25148-3-git-send-email-yang.z.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 21, 2013 at 06:49:20PM +0800, Yang Zhang wrote: > From: Yang Zhang <yang.z.zhang@Intel.com> > > Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com> > --- > virt/kvm/ioapic.h | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h > index 2fc61a5..6e5c88f 100644 > --- a/virt/kvm/ioapic.h > +++ b/virt/kvm/ioapic.h > @@ -34,6 +34,11 @@ struct kvm_vcpu; > #define IOAPIC_INIT 0x5 > #define IOAPIC_EXTINT 0x7 > > +struct rtc_status { > + int pending_eoi; > + DECLARE_BITMAP(dest_map, KVM_MAX_VCPUS); > +}; > + > struct kvm_ioapic { > u64 base_address; > u32 ioregsel; > @@ -47,6 +52,9 @@ struct kvm_ioapic { > void (*ack_notifier)(void *opaque, int irq); > spinlock_t lock; > DECLARE_BITMAP(handled_vectors, 256); > +#ifdef CONFIG_X86 > + struct rtc_status rtc_status; > +#endif IA64 KVM is almost dead, but we still add CONFIG_X86 everywhere in these patches. Lets drop all CONFIG_X86 throughout the patches and instead leave only one: #ifdef CONFIG_X86 #define RTC_GSI 8 else #define RTC_GSI 255 #endif Then use RTC_GSI instead of 8 everywhere and the code will be effectively disabled on IA64. > }; > > #ifdef DEBUG > -- > 1.7.1 -- Gleb. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Gleb Natapov wrote on 2013-03-21: > On Thu, Mar 21, 2013 at 06:49:20PM +0800, Yang Zhang wrote: >> From: Yang Zhang <yang.z.zhang@Intel.com> >> >> Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com> >> --- >> virt/kvm/ioapic.h | 8 ++++++++ >> 1 files changed, 8 insertions(+), 0 deletions(-) >> diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h >> index 2fc61a5..6e5c88f 100644 >> --- a/virt/kvm/ioapic.h >> +++ b/virt/kvm/ioapic.h >> @@ -34,6 +34,11 @@ struct kvm_vcpu; >> #define IOAPIC_INIT 0x5 >> #define IOAPIC_EXTINT 0x7 >> +struct rtc_status { >> + int pending_eoi; >> + DECLARE_BITMAP(dest_map, KVM_MAX_VCPUS); >> +}; >> + >> struct kvm_ioapic { u64 base_address; u32 ioregsel; @@ -47,6 +52,9 >> @@ struct kvm_ioapic { void (*ack_notifier)(void *opaque, int irq); >> spinlock_t lock; DECLARE_BITMAP(handled_vectors, 256); >> +#ifdef CONFIG_X86 >> + struct rtc_status rtc_status; >> +#endif > IA64 KVM is almost dead, but we still add CONFIG_X86 everywhere in these > patches. Lets drop all CONFIG_X86 throughout the patches and instead leave > only one: > #ifdef CONFIG_X86 > #define RTC_GSI 8 > else > #define RTC_GSI 255 > #endif > > Then use RTC_GSI instead of 8 everywhere and the code will be effectively > disabled on IA64. Nice idea! >> }; >> >> #ifdef DEBUG >> -- >> 1.7.1 > > -- > Gleb. Best regards, Yang -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index 2fc61a5..6e5c88f 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h @@ -34,6 +34,11 @@ struct kvm_vcpu; #define IOAPIC_INIT 0x5 #define IOAPIC_EXTINT 0x7 +struct rtc_status { + int pending_eoi; + DECLARE_BITMAP(dest_map, KVM_MAX_VCPUS); +}; + struct kvm_ioapic { u64 base_address; u32 ioregsel; @@ -47,6 +52,9 @@ struct kvm_ioapic { void (*ack_notifier)(void *opaque, int irq); spinlock_t lock; DECLARE_BITMAP(handled_vectors, 256); +#ifdef CONFIG_X86 + struct rtc_status rtc_status; +#endif }; #ifdef DEBUG