[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v8 07/21] xen/x86: allow disabling the emulated IO APIC
Signed-off-by: Roger Pau Monnà <roger.pau@xxxxxxxxxx> Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Cc: Jan Beulich <jbeulich@xxxxxxxx> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- Changes since v6: - Return ENODEV in ioapic_load if the ioapic is disabled. - Add an assert to make sure vioapic_update_EOI and vioapic_irq_positive_edge is only called when the vioapic is enabled. Changes since v4: - Add Andrew Cooper Acked-by. --- xen/arch/x86/hvm/vioapic.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index d348235..611be87 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -365,6 +365,8 @@ void vioapic_irq_positive_edge(struct domain *d, unsigned int irq) struct hvm_hw_vioapic *vioapic = domain_vioapic(d); union vioapic_redir_entry *ent; + ASSERT(has_vioapic(d)); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "irq %x", irq); ASSERT(irq < VIOAPIC_NUM_PINS); @@ -392,6 +394,8 @@ void vioapic_update_EOI(struct domain *d, u8 vector) union vioapic_redir_entry *ent; int gsi; + ASSERT(has_vioapic(d)); + spin_lock(&d->arch.hvm_domain.irq_lock); for ( gsi = 0; gsi < VIOAPIC_NUM_PINS; gsi++ ) @@ -424,12 +428,20 @@ void vioapic_update_EOI(struct domain *d, u8 vector) static int ioapic_save(struct domain *d, hvm_domain_context_t *h) { struct hvm_hw_vioapic *s = domain_vioapic(d); + + if ( !has_vioapic(d) ) + return 0; + return hvm_save_entry(IOAPIC, 0, h, s); } static int ioapic_load(struct domain *d, hvm_domain_context_t *h) { struct hvm_hw_vioapic *s = domain_vioapic(d); + + if ( !has_vioapic(d) ) + return -ENODEV; + return hvm_load_entry(IOAPIC, h, s); } @@ -440,6 +452,9 @@ void vioapic_reset(struct domain *d) struct hvm_vioapic *vioapic = d->arch.hvm_domain.vioapic; int i; + if ( !has_vioapic(d) ) + return; + memset(&vioapic->hvm_hw_vioapic, 0, sizeof(vioapic->hvm_hw_vioapic)); for ( i = 0; i < VIOAPIC_NUM_PINS; i++ ) vioapic->hvm_hw_vioapic.redirtbl[i].fields.mask = 1; @@ -448,6 +463,9 @@ void vioapic_reset(struct domain *d) int vioapic_init(struct domain *d) { + if ( !has_vioapic(d) ) + return 0; + if ( (d->arch.hvm_domain.vioapic == NULL) && ((d->arch.hvm_domain.vioapic = xmalloc(struct hvm_vioapic)) == NULL) ) return -ENOMEM; @@ -462,6 +480,9 @@ int vioapic_init(struct domain *d) void vioapic_deinit(struct domain *d) { + if ( !has_vioapic(d) ) + return; + xfree(d->arch.hvm_domain.vioapic); d->arch.hvm_domain.vioapic = NULL; } -- 1.9.5 (Apple Git-50.3) _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |