lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Split IOAPIC structure

Browse Source 
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>
This commit is contained in:
Sheng Yang
2009-02-11 16:03:36 +08:00
committed by Avi Kivity
parent 5897297bc2
commit cf9e4e15e8
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/linux/kvm_types.h
View File

@@ -40,4 +40,21 @@ typedef unsigned long hfn_t;
typedef hfn_t pfn_t; typedef hfn_t pfn_t;
union kvm_ioapic_redirect_entry {
u64 bits;
struct {
u8 vector;
u8 delivery_mode:3;
u8 dest_mode:1;
u8 delivery_status:1;
u8 polarity:1;
u8 remote_irr:1;
u8 trig_mode:1;
u8 mask:1;
u8 reserve:7;
u8 reserved[4];
u8 dest_id;
} fields;
};
#endif /* __KVM_TYPES_H__ */ #endif /* __KVM_TYPES_H__ */

6
virt/kvm/ioapic.c
View File

@@ -85,7 +85,7 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx) static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx)
{ {
union ioapic_redir_entry *pent; union kvm_ioapic_redirect_entry *pent;
int injected = -1; int injected = -1;
pent = &ioapic->redirtbl[idx]; pent = &ioapic->redirtbl[idx];
@@ -284,7 +284,7 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level)
{ {
u32 old_irr = ioapic->irr; u32 old_irr = ioapic->irr;
u32 mask = 1 << irq; u32 mask = 1 << irq;
union ioapic_redir_entry entry; union kvm_ioapic_redirect_entry entry;
int ret = 1; int ret = 1;
if (irq >= 0 && irq < IOAPIC_NUM_PINS) { if (irq >= 0 && irq < IOAPIC_NUM_PINS) {
@@ -305,7 +305,7 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level)
static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int pin, static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int pin,
int trigger_mode) int trigger_mode)
{ {
union ioapic_redir_entry *ent; union kvm_ioapic_redirect_entry *ent;
ent = &ioapic->redirtbl[pin]; ent = &ioapic->redirtbl[pin];

17
virt/kvm/ioapic.h
View File

@@ -40,22 +40,7 @@ struct kvm_ioapic {
u32 id; u32 id;
u32 irr; u32 irr;
u32 pad; u32 pad;
union ioapic_redir_entry { union kvm_ioapic_redirect_entry redirtbl[IOAPIC_NUM_PINS];
u64 bits;
struct {
u8 vector;
u8 delivery_mode:3;
u8 dest_mode:1;
u8 delivery_status:1;
u8 polarity:1;
u8 remote_irr:1;
u8 trig_mode:1;
u8 mask:1;
u8 reserve:7;
u8 reserved[4];
u8 dest_id;
} fields;
} redirtbl[IOAPIC_NUM_PINS];
struct kvm_io_device dev; struct kvm_io_device dev;
struct kvm *kvm; struct kvm *kvm;
void (*ack_notifier)(void *opaque, int irq); void (*ack_notifier)(void *opaque, int irq);