1 files changed, 1 insertions, 16 deletions
diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h
index a34bd5e6436b..008ec873d018 100644
--- a/virt/kvm/ioapic.h
+++ b/virt/kvm/ioapic.h
@@ -40,22 +40,7 @@ struct kvm_ioapic {
        u32 id;
        u32 irr;
        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 *kvm;
        void (*ack_notifier)(void *opaque, int irq);

diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index a34bd5e6436b..008ec873d018 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h
@@ -40,22 +40,7 @@ struct kvm_ioapic {
40	u32 id;	40	u32 id;
41	u32 irr;	41	u32 irr;
42	u32 pad;	42	u32 pad;
43	union ioapic_redir_entry {	43	union kvm_ioapic_redirect_entry redirtbl[IOAPIC_NUM_PINS];
44	u64 bits;
45	struct {
46	u8 vector;
47	u8 delivery_mode:3;
48	u8 dest_mode:1;
49	u8 delivery_status:1;
50	u8 polarity:1;
51	u8 remote_irr:1;
52	u8 trig_mode:1;
53	u8 mask:1;
54	u8 reserve:7;
55	u8 reserved[4];
56	u8 dest_id;
57	} fields;
58	} redirtbl[IOAPIC_NUM_PINS];
59	struct kvm_io_device dev;	44	struct kvm_io_device dev;
60	struct kvm *kvm;	45	struct kvm *kvm;
61	void (ack_notifier)(void opaque, int irq);	46	void (ack_notifier)(void opaque, int irq);