diff options
| author | Robert Mustacchi <rm@joyent.com> | 2011-06-29 13:23:17 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2011-06-29 13:23:17 -0700 |
| commit | 718babe9a9a850decf23060a9c32133e7bb943cf (patch) | |
| tree | b52ccc4353a45d1102e4931e2f2158abc0e88012 | |
| parent | ff09c7a12308ea886df0f5e0fcf7a2210f964415 (diff) | |
| download | illumos-kvm-718babe9a9a850decf23060a9c32133e7bb943cf.tar.gz | |
HVM-442 kvm_irq.h should be cstyle clean
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | kvm_irq.h | 40 |
2 files changed, 21 insertions, 20 deletions
@@ -29,6 +29,7 @@ HEADERS= \ kvm_impl.h \ kvm_ioapic.h \ kvm_iodev.h \ + kvm_irq.h \ kvm_x86.h kvm: kvm.c kvm_x86.c kvm_emulate.c kvm.h kvm_x86host.h msr.h kvm_bitops.h kvm_irq.c kvm_i8254.c kvm_lapic.c kvm_mmu.c kvm_iodev.c kvm_ioapic.c kvm_vmx.c kvm_i8259.c kvm_coalesced_mmio.c kvm_irq_comm.c kvm_cache_regs.c kvm_bitops.c $(HEADERS) @@ -20,7 +20,7 @@ */ #ifndef __IRQ_H -#define __IRQ_H +#define __IRQ_H #include <sys/mutex.h> #include "kvm_host.h" @@ -29,8 +29,8 @@ #include "kvm_ioapic.h" #include "kvm_lapic.h" -#define PIC_NUM_PINS 16 -#define SELECT_PIC(irq) \ +#define PIC_NUM_PINS 16 +#define SELECT_PIC(irq) \ ((irq) < 8 ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE) struct kvm; @@ -72,26 +72,26 @@ typedef struct kvm_pic { unsigned long irq_states[16]; } kvm_pic_t; -struct kvm_pic *kvm_create_pic(struct kvm *kvm); -void kvm_destroy_pic(struct kvm *kvm); -int kvm_pic_read_irq(struct kvm *kvm); -void kvm_pic_update_irq(struct kvm_pic *s); -void kvm_pic_clear_isr_ack(struct kvm *kvm); +extern struct kvm_pic *kvm_create_pic(struct kvm *kvm); +extern void kvm_destroy_pic(struct kvm *kvm); +extern int kvm_pic_read_irq(struct kvm *kvm); +extern void kvm_pic_update_irq(struct kvm_pic *s); +extern void kvm_pic_clear_isr_ack(struct kvm *kvm); -struct kvm_pic *pic_irqchip(struct kvm *kvm); -int irqchip_in_kernel(struct kvm *kvm); +extern struct kvm_pic *pic_irqchip(struct kvm *kvm); +extern int irqchip_in_kernel(struct kvm *kvm); -void kvm_pic_reset(struct kvm_kpic_state *s); -void kvm_inject_pit_timer_irqs(struct kvm_vcpu *vcpu); +extern void kvm_pic_reset(struct kvm_kpic_state *s); +extern void kvm_inject_pit_timer_irqs(struct kvm_vcpu *vcpu); -void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); -void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); -void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *vcpu); -void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); -void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); -void __kvm_migrate_timers(struct kvm_vcpu *vcpu); +extern void kvm_inject_pending_timer_irqs(struct kvm_vcpu *); +extern void kvm_inject_apic_timer_irqs(struct kvm_vcpu *); +extern void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *); +extern void __kvm_migrate_apic_timer(struct kvm_vcpu *); +extern void __kvm_migrate_pit_timer(struct kvm_vcpu *); +extern void __kvm_migrate_timers(struct kvm_vcpu *); -int pit_has_pending_timer(struct kvm_vcpu *vcpu); -int apic_has_pending_timer(struct kvm_vcpu *vcpu); +extern int pit_has_pending_timer(struct kvm_vcpu *); +extern int apic_has_pending_timer(struct kvm_vcpu *); #endif |