lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen: no need to delay xen_setup_shutdown_event for hvm guests anymore

Browse Source 
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>
This commit is contained in:
Stefano Stabellini
2010-12-02 17:54:50 +00:00
parent f5412be599
commit 702d4eb9b3
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/xen/manage.c
View File

@@ -291,27 +291,18 @@ static int shutdown_event(struct notifier_block *notifier,
return NOTIFY_DONE; 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) int xen_setup_shutdown_event(void)
{ {
static struct notifier_block xenstore_notifier = { static struct notifier_block xenstore_notifier = {
.notifier_call = shutdown_event .notifier_call = shutdown_event
}; };
if (!xen_domain())
return -ENODEV;
register_xenstore_notifier(&xenstore_notifier); register_xenstore_notifier(&xenstore_notifier);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(xen_setup_shutdown_event); EXPORT_SYMBOL_GPL(xen_setup_shutdown_event);
subsys_initcall(__setup_shutdown_event); subsys_initcall(xen_setup_shutdown_event);

3
drivers/xen/platform-pci.c
View File

@@ -156,9 +156,6 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
if (ret) if (ret)
goto out; goto out;
xenbus_probe(NULL); xenbus_probe(NULL);
ret = xen_setup_shutdown_event();
if (ret)
goto out;
return 0; return 0;
out: out: