diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-05-14 07:44:30 -0400 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-07-27 02:13:25 -0400 |
commit | c1c5413ad58cb73267d328e6020268aa2e50d8ca (patch) | |
tree | f2c66141ab8d9fdb7b16a13d4d510ad09b2430ed /Documentation/kernel-parameters.txt | |
parent | 409771d258e9dd71c30f3c9520fd2b796ffc40f0 (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 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 82d6aeb5228f..eefcd805102e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -115,6 +115,7 @@ parameter is applicable: | |||
115 | More X86-64 boot options can be found in | 115 | More X86-64 boot options can be found in |
116 | Documentation/x86/x86_64/boot-options.txt . | 116 | Documentation/x86/x86_64/boot-options.txt . |
117 | X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) | 117 | X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) |
118 | XEN Xen support is enabled | ||
118 | 119 | ||
119 | In addition, the following text indicates that the option: | 120 | In addition, the following text indicates that the option: |
120 | 121 | ||
@@ -2879,6 +2880,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2879 | xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. | 2880 | xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. |
2880 | xd_geo= See header of drivers/block/xd.c. | 2881 | xd_geo= See header of drivers/block/xd.c. |
2881 | 2882 | ||
2883 | xen_emul_unplug= [HW,X86,XEN] | ||
2884 | Unplug Xen emulated devices | ||
2885 | Format: [unplug0,][unplug1] | ||
2886 | ide-disks -- unplug primary master IDE devices | ||
2887 | aux-ide-disks -- unplug non-primary-master IDE devices | ||
2888 | nics -- unplug network devices | ||
2889 | all -- unplug all emulated devices (NICs and IDE disks) | ||
2890 | ignore -- continue loading the Xen platform PCI driver even | ||
2891 | if the version check failed | ||
2892 | |||
2882 | xirc2ps_cs= [NET,PCMCIA] | 2893 | xirc2ps_cs= [NET,PCMCIA] |
2883 | Format: | 2894 | Format: |
2884 | <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] | 2895 | <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] |