From: Tetsu Yamamoto <tyamamot@redhat.com> Date: Mon, 4 Aug 2008 15:47:59 -0400 Subject: [xen] ia64: quiet lookup_domain_mpa when domain is dying Message-id: 20080804194759.8452.18215.sendpatchset@pq0-1.lab.bos.redhat.com O-Subject: [RHEL5.3 PATCH 1/10] xen-ia64: Quiet lookup_domain_mpa() when domain is dying Bugzilla: 430219 RH-Acked-by: Bill Burns <bburns@redhat.com> bz430219 # HG changeset patch # User Alex Williamson <alex.williamson@hp.com> # 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@valinux.co.jp> diff --git a/arch/ia64/xen/mm.c b/arch/ia64/xen/mm.c index 46570b4..48119f5 100644 --- a/arch/ia64/xen/mm.c +++ b/arch/ia64/xen/mm.c @@ -717,19 +717,22 @@ unsigned long lookup_domain_mpa(struct domain *d, unsigned long mpaddr, 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)