pvops: do not notify callers from register_xenstore_notifier
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 16 Jul 2010 16:30:19 +0000 (17:30 +0100)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Wed, 4 Aug 2010 21:47:28 +0000 (14:47 -0700)
Currently register_xenstore_notifier notifies the caller during the
registration itself if xenstore is believed to be ready. This behaviour
causes problems to PV on HVM guests, in which case callers should be
notified by xenbus_probe only after the platform pci driver is loaded.
We already make sure xenbus_probe is called at the right time, calling
it either from device_initcall (PV case) or from the platform pci
driver initialization (HVM case) so we don't need this additional
notification.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
drivers/xen/xenbus/xenbus_probe.c

index 3479332..abc1242 100644 (file)
@@ -752,10 +752,7 @@ int register_xenstore_notifier(struct notifier_block *nb)
 {
        int ret = 0;
 
 {
        int ret = 0;
 
-       if (xenstored_ready > 0)
-               ret = nb->notifier_call(nb, 0, NULL);
-       else
-               blocking_notifier_chain_register(&xenstore_chain, nb);
+       blocking_notifier_chain_register(&xenstore_chain, nb);
 
        return ret;
 }
 
        return ret;
 }