summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2010-08-23 11:59:29 +0100
committerIan Campbell <ian.campbell@citrix.com>2010-08-23 11:59:29 +0100
commit1dc7ce99b091a11cce0f34456c1ffcb928f17edd (patch)
treeb9f125fc324a86ff4af64fb0799d20330f61084c /Documentation
parentc93a4dfb31f2c023da3ad1238c352452f2cc0e05 (diff)
downloadlinux-3.10-1dc7ce99b091a11cce0f34456c1ffcb928f17edd.tar.gz
linux-3.10-1dc7ce99b091a11cce0f34456c1ffcb928f17edd.tar.bz2
linux-3.10-1dc7ce99b091a11cce0f34456c1ffcb928f17edd.zip
xen: pvhvm: rename xen_emul_unplug=ignore to =unnnecessary
It is not immediately clear what this option causes to become ignored. The actual meaning is that it is not necessary to unplug the emulated devices to safely use the PV ones, even if the platform does not support the unplug protocol. (pressumably the user will only add this option if they have ensured that their domain configuration is safe). I think xen_emul_unplug=unnecessary better captures this. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8bbe83b9d0b..f084af0cb8e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2629,8 +2629,9 @@ and is between 256 and 4096 characters. It is defined in the file
aux-ide-disks -- unplug non-primary-master IDE devices
nics -- unplug network devices
all -- unplug all emulated devices (NICs and IDE disks)
- ignore -- continue loading the Xen platform PCI driver even
- if the version check failed
+ unnecessary -- unplugging emulated devices is
+ unnecessary even if the host did not respond to
+ the unplug protocol
never -- do not unplug even if version check succeeds
xirc2ps_cs= [NET,PCMCIA]