lkml.org 
[lkml]   [2011]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/6] xen: no need to delay xen_setup_shutdown_event for hvm guests anymore
    Date
    From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

    Now that xenstore_ready is used correctly for PV on HVM guests too, we
    don't need to delay the initialization of xen_setup_shutdown_event
    anymore.

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
    ---
    drivers/xen/manage.c | 17 ++++-------------
    drivers/xen/platform-pci.c | 3 ---
    2 files changed, 4 insertions(+), 16 deletions(-)

    diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
    index 2417727..b2a8d78 100644
    --- a/drivers/xen/manage.c
    +++ b/drivers/xen/manage.c
    @@ -291,27 +291,18 @@ static int shutdown_event(struct notifier_block *notifier,
    return NOTIFY_DONE;
    }

    -static int __init __setup_shutdown_event(void)
    -{
    - /* Delay initialization in the PV on HVM case */
    - if (xen_hvm_domain())
    - return 0;
    -
    - if (!xen_pv_domain())
    - return -ENODEV;
    -
    - return xen_setup_shutdown_event();
    -}
    -
    int xen_setup_shutdown_event(void)
    {
    static struct notifier_block xenstore_notifier = {
    .notifier_call = shutdown_event
    };
    +
    + if (!xen_domain())
    + return -ENODEV;
    register_xenstore_notifier(&xenstore_notifier);

    return 0;
    }
    EXPORT_SYMBOL_GPL(xen_setup_shutdown_event);

    -subsys_initcall(__setup_shutdown_event);
    +subsys_initcall(xen_setup_shutdown_event);
    diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
    index afbe041..319dd0a 100644
    --- a/drivers/xen/platform-pci.c
    +++ b/drivers/xen/platform-pci.c
    @@ -156,9 +156,6 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
    if (ret)
    goto out;
    xenbus_probe(NULL);
    - ret = xen_setup_shutdown_event();
    - if (ret)
    - goto out;
    return 0;

    out:
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2011-02-25 18:15    [W:0.019 / U:29.192 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site