diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-09-06 11:31:02 +0100 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-09-06 11:31:02 +0100 |
commit | a65041a5327954ee75109bd112f062f8ba273bc1 (patch) | |
tree | a3c01efc1f0bd856fa4d4b828a00a628542791ec /xen/arch/x86/hvm/irq.c | |
parent | 0671a3ce432c44a7f52cb3cfdef71f146970c3d0 (diff) | |
download | xen-a65041a5327954ee75109bd112f062f8ba273bc1.tar.gz xen-a65041a5327954ee75109bd112f062f8ba273bc1.tar.bz2 xen-a65041a5327954ee75109bd112f062f8ba273bc1.zip |
hvm: Remove hvm-specific NMI flag and use generic flag instead.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/hvm/irq.c')
-rw-r--r-- | xen/arch/x86/hvm/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 9212e93fe1..b41295a273 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -289,7 +289,7 @@ enum hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) { struct hvm_domain *plat = &v->domain->arch.hvm_domain; - if ( unlikely(v->arch.hvm_vcpu.nmi_pending) ) + if ( unlikely(v->nmi_pending) ) return hvm_intack_nmi; if ( vlapic_has_interrupt(v) != -1 ) @@ -306,7 +306,7 @@ int hvm_vcpu_ack_pending_irq(struct vcpu *v, enum hvm_intack type, int *vector) switch ( type ) { case hvm_intack_nmi: - return test_and_clear_bool(v->arch.hvm_vcpu.nmi_pending); + return test_and_clear_bool(v->nmi_pending); case hvm_intack_lapic: return ((*vector = cpu_get_apic_interrupt(v)) != -1); case hvm_intack_pic: |