# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1178831907 21600
# Node ID 8745300bec4ec254b3e2426e4fb5e3f4a9e0e0bc
# Parent d431761a032a791bbb5924d56851f594c0078ce4
[IA64] Quiet lookup_domain_mpa() when domain is dying.
Message clean up in lookup_domain_mpa(). It is possible that current != d.
This patch addresses xensource bugzilla #944
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
xen/arch/ia64/xen/mm.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff -r d431761a032a -r 8745300bec4e xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c Thu May 10 13:29:33 2007 -0600
+++ b/xen/arch/ia64/xen/mm.c Thu May 10 15:18:27 2007 -0600
@@ -666,19 +666,22 @@ unsigned long lookup_domain_mpa(struct d
return GPFN_INV_MASK;
}
- if (mpaddr < d->arch.convmem_end) {
+ if (mpaddr < d->arch.convmem_end && !d->is_dying) {
gdprintk(XENLOG_WARNING, "vcpu %d iip 0x%016lx: non-allocated mpa "
- "0x%lx (< 0x%lx)\n", current->vcpu_id, PSCB(current, iip),
- mpaddr, d->arch.convmem_end);
+ "d %"PRId16" 0x%lx (< 0x%lx)\n",
+ current->vcpu_id, PSCB(current, iip),
+ d->domain_id, mpaddr, d->arch.convmem_end);
} else if (mpaddr - IO_PORTS_PADDR < IO_PORTS_SIZE) {
/* Log I/O port probing, but complain less loudly about it */
gdprintk(XENLOG_INFO, "vcpu %d iip 0x%016lx: bad I/O port access "
- "0x%lx\n", current->vcpu_id, PSCB(current, iip),
+ "d %"PRId16" 0x%lx\n",
+ current->vcpu_id, PSCB(current, iip), d->domain_id,
IO_SPACE_SPARSE_DECODING(mpaddr - IO_PORTS_PADDR));
} else {
- gdprintk(XENLOG_WARNING, "vcpu %d iip 0x%016lx: bad mpa 0x%lx "
- "(=> 0x%lx)\n", current->vcpu_id, PSCB(current, iip),
- mpaddr, d->arch.convmem_end);
+ gdprintk(XENLOG_WARNING, "vcpu %d iip 0x%016lx: bad mpa "
+ "d %"PRId16" 0x%lx (=> 0x%lx)\n",
+ current->vcpu_id, PSCB(current, iip),
+ d->domain_id, mpaddr, d->arch.convmem_end);
}
if (entry != NULL)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|