diff options
author | Sheng Yang <sheng@linux.intel.com> | 2009-02-11 03:03:36 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:21 -0400 |
commit | cf9e4e15e8f6306b2559979269ead7c02e6b2b95 (patch) | |
tree | 08913212c62e64e3f3a6622e9cc302e7b1f386b5 /virt/kvm/ioapic.c | |
parent | 5897297bc228fc3c85fdc421fd5c487f9a99821a (diff) |
KVM: Split IOAPIC structure
Prepared for reuse ioapic_redir_entry for MSI.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/ioapic.c')
-rw-r--r-- | virt/kvm/ioapic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index c3b99def9cbc..812801317e36 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c | |||
@@ -85,7 +85,7 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, | |||
85 | 85 | ||
86 | static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx) | 86 | static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx) |
87 | { | 87 | { |
88 | union ioapic_redir_entry *pent; | 88 | union kvm_ioapic_redirect_entry *pent; |
89 | int injected = -1; | 89 | int injected = -1; |
90 | 90 | ||
91 | pent = &ioapic->redirtbl[idx]; | 91 | pent = &ioapic->redirtbl[idx]; |
@@ -284,7 +284,7 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) | |||
284 | { | 284 | { |
285 | u32 old_irr = ioapic->irr; | 285 | u32 old_irr = ioapic->irr; |
286 | u32 mask = 1 << irq; | 286 | u32 mask = 1 << irq; |
287 | union ioapic_redir_entry entry; | 287 | union kvm_ioapic_redirect_entry entry; |
288 | int ret = 1; | 288 | int ret = 1; |
289 | 289 | ||
290 | if (irq >= 0 && irq < IOAPIC_NUM_PINS) { | 290 | if (irq >= 0 && irq < IOAPIC_NUM_PINS) { |
@@ -305,7 +305,7 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) | |||
305 | static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int pin, | 305 | static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int pin, |
306 | int trigger_mode) | 306 | int trigger_mode) |
307 | { | 307 | { |
308 | union ioapic_redir_entry *ent; | 308 | union kvm_ioapic_redirect_entry *ent; |
309 | 309 | ||
310 | ent = &ioapic->redirtbl[pin]; | 310 | ent = &ioapic->redirtbl[pin]; |
311 | 311 | ||