aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/xenbus
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-05-14 07:44:30 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-27 02:13:25 -0400
commitc1c5413ad58cb73267d328e6020268aa2e50d8ca (patch)
treef2c66141ab8d9fdb7b16a13d4d510ad09b2430ed /drivers/xen/xenbus
parent409771d258e9dd71c30f3c9520fd2b796ffc40f0 (diff)
x86: Unplug emulated disks and nics.
Add a xen_emul_unplug command line option to the kernel to unplug xen emulated disks and nics. Set the default value of xen_emul_unplug depending on whether or not the Xen PV frontends and the Xen platform PCI driver have been compiled for this kernel (modules or built-in are both OK). The user can specify xen_emul_unplug=ignore to enable PV drivers on HVM even if the host platform doesn't support unplug. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen/xenbus')
-rw-r--r--drivers/xen/xenbus/xenbus_probe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index a9e83c438cbb..37e8894b50d6 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -56,6 +56,7 @@
56#include <xen/events.h> 56#include <xen/events.h>
57#include <xen/page.h> 57#include <xen/page.h>
58 58
59#include <xen/platform_pci.h>
59#include <xen/hvm.h> 60#include <xen/hvm.h>
60 61
61#include "xenbus_comms.h" 62#include "xenbus_comms.h"
@@ -977,6 +978,9 @@ static void wait_for_devices(struct xenbus_driver *xendrv)
977#ifndef MODULE 978#ifndef MODULE
978static int __init boot_wait_for_devices(void) 979static int __init boot_wait_for_devices(void)
979{ 980{
981 if (xen_hvm_domain() && !xen_platform_pci_unplug)
982 return -ENODEV;
983
980 ready_to_wait_for_devices = 1; 984 ready_to_wait_for_devices = 1;
981 wait_for_devices(NULL); 985 wait_for_devices(NULL);
982 return 0; 986 return 0;