lkml.org 
[lkml]   [2015]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 66/92] xen/console: Update console event channel on resume
    Date
    3.19.8-ckt1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Boris Ostrovsky <boris.ostrovsky@oracle.com>

    commit b9d934f27c91b878c4b2e64299d6e419a4022f8d upstream.

    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>
    Signed-off-by: David Vrabel <david.vrabel@citrix.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/tty/hvc/hvc_xen.c | 18 +++++++++++++++++-
    1 file changed, 17 insertions(+), 1 deletion(-)

    diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
    index f1e5742..5bab1c6 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)
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-05-26 18:21    [W:4.361 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site