Commit 1dc7ce99b091a11cce0f34456c1ffcb928f17edd
1 parent
c93a4dfb31
Exists in
master
and in
7 other branches
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>
Showing 4 changed files with 12 additions and 10 deletions Side-by-side Diff
Documentation/kernel-parameters.txt
| ... | ... | @@ -2629,8 +2629,9 @@ |
| 2629 | 2629 | aux-ide-disks -- unplug non-primary-master IDE devices |
| 2630 | 2630 | nics -- unplug network devices |
| 2631 | 2631 | all -- unplug all emulated devices (NICs and IDE disks) |
| 2632 | - ignore -- continue loading the Xen platform PCI driver even | |
| 2633 | - if the version check failed | |
| 2632 | + unnecessary -- unplugging emulated devices is | |
| 2633 | + unnecessary even if the host did not respond to | |
| 2634 | + the unplug protocol | |
| 2634 | 2635 | never -- do not unplug even if version check succeeds |
| 2635 | 2636 | |
| 2636 | 2637 | xirc2ps_cs= [NET,PCMCIA] |
arch/x86/xen/platform-pci-unplug.c
| ... | ... | @@ -78,10 +78,11 @@ |
| 78 | 78 | /* check the version of the xen platform PCI device */ |
| 79 | 79 | r = check_platform_magic(); |
| 80 | 80 | /* If the version matches enable the Xen platform PCI driver. |
| 81 | - * Also enable the Xen platform PCI driver if the version is really old | |
| 82 | - * and the user told us to ignore it. */ | |
| 81 | + * Also enable the Xen platform PCI driver if the host does | |
| 82 | + * not support the unplug protocol (XEN_PLATFORM_ERR_MAGIC) | |
| 83 | + * but the user told us that unplugging is unnecessary. */ | |
| 83 | 84 | if (r && !(r == XEN_PLATFORM_ERR_MAGIC && |
| 84 | - (xen_emul_unplug & XEN_UNPLUG_IGNORE))) | |
| 85 | + (xen_emul_unplug & XEN_UNPLUG_UNNECESSARY))) | |
| 85 | 86 | return; |
| 86 | 87 | /* Set the default value of xen_emul_unplug depending on whether or |
| 87 | 88 | * not the Xen PV frontends and the Xen platform PCI driver have |
| ... | ... | @@ -102,7 +103,7 @@ |
| 102 | 103 | } |
| 103 | 104 | } |
| 104 | 105 | /* Now unplug the emulated devices */ |
| 105 | - if (!(xen_emul_unplug & XEN_UNPLUG_IGNORE)) | |
| 106 | + if (!(xen_emul_unplug & XEN_UNPLUG_UNNECESSARY)) | |
| 106 | 107 | outw(xen_emul_unplug, XEN_IOPORT_UNPLUG); |
| 107 | 108 | xen_platform_pci_unplug = xen_emul_unplug; |
| 108 | 109 | } |
| ... | ... | @@ -128,8 +129,8 @@ |
| 128 | 129 | xen_emul_unplug |= XEN_UNPLUG_AUX_IDE_DISKS; |
| 129 | 130 | else if (!strncmp(p, "nics", l)) |
| 130 | 131 | xen_emul_unplug |= XEN_UNPLUG_ALL_NICS; |
| 131 | - else if (!strncmp(p, "ignore", l)) | |
| 132 | - xen_emul_unplug |= XEN_UNPLUG_IGNORE; | |
| 132 | + else if (!strncmp(p, "unnecessary", l)) | |
| 133 | + xen_emul_unplug |= XEN_UNPLUG_UNNECESSARY; | |
| 133 | 134 | else if (!strncmp(p, "never", l)) |
| 134 | 135 | xen_emul_unplug |= XEN_UNPLUG_NEVER; |
| 135 | 136 | else |
drivers/block/xen-blkfront.c
| ... | ... | @@ -834,7 +834,7 @@ |
| 834 | 834 | char *type; |
| 835 | 835 | int len; |
| 836 | 836 | /* no unplug has been done: do not hook devices != xen vbds */ |
| 837 | - if (xen_platform_pci_unplug & XEN_UNPLUG_IGNORE) { | |
| 837 | + if (xen_platform_pci_unplug & XEN_UNPLUG_UNNECESSARY) { | |
| 838 | 838 | int major; |
| 839 | 839 | |
| 840 | 840 | if (!VDEV_IS_EXTENDED(vdevice)) |
include/xen/platform_pci.h