diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2015-04-29 17:10:14 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-05-05 18:27:14 +0100 |
| commit | b9d934f27c91b878c4b2e64299d6e419a4022f8d (patch) | |
| tree | d18f9087d81ed59ec199eed1696aa754a5171618 | |
| parent | 16f1cf3ba7303228372d3756677bf7d10e79cf9f (diff) | |
| download | linux-b9d934f27c91b878c4b2e64299d6e419a4022f8d.tar.gz | |
xen/console: Update console event channel on resume
After a resume the hypervisor/tools may change console event
channel number. We should re-query it.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index f1e57425e39ff..5bab1c684bb11 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -299,11 +299,27 @@ static int xen_initial_domain_console_init(void) return 0; } +static void xen_console_update_evtchn(struct xencons_info *info) +{ + if (xen_hvm_domain()) { + uint64_t v; + int err; + + err = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); + if (!err && v) + info->evtchn = v; + } else + info->evtchn = xen_start_info->console.domU.evtchn; +} + void xen_console_resume(void) { struct xencons_info *info = vtermno_to_xencons(HVC_COOKIE); - if (info != NULL && info->irq) + if (info != NULL && info->irq) { + if (!xen_initial_domain()) + xen_console_update_evtchn(info); rebind_evtchn_irq(info->evtchn, info->irq); + } } static void xencons_disconnect_backend(struct xencons_info *info) |