047483513a
xen-4.6.0-testing-src.tar.bz2 mini-os.tar.bz2 blktap2-no-uninit.patch stubdom-have-iovec.patch - Renamed xsa149.patch to CVE-2015-7969-xsa149.patch - Dropped patches now contained in tarball or unnecessary xen-4.5.2-testing-src.tar.bz2 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch 54f4985f-libxl-fix-libvirtd-double-free.patch 55103616-vm-assist-prepare-for-discontiguous-used-bit-numbers.patch 551ac326-xentop-add-support-for-qdisk.patch 552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch 552d0fe8-x86-mtrr-include-asm-atomic.h.patch 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch 5548e903-domctl-don-t-truncate-XEN_DOMCTL_max_mem-requests.patch 5548e95d-x86-allow-to-suppress-M2P-user-mode-exposure.patch 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.patch 554cc211-libxl-add-qxl.patch 55534b0a-x86-provide-add_sized.patch 55534b25-arm-provide-add_sized.patch 5555a4f8-use-ticket-locks-for-spin-locks.patch 5555a5b9-x86-arm-remove-asm-spinlock-h.patch 5555a8ec-introduce-non-contiguous-allocation.patch 556d973f-unmodified-drivers-tolerate-IRQF_DISABLED-being-undefined.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=387
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
fate#311487
|
|
|
|
Handle xen_emul_unplug from xenlinux based core kernel.
|
|
|
|
If the kernel was booted with xen_emul_unplug=(never|ide-disks|nics) unplug only
|
|
what was requested. Kernel cmdline option is prefered over module option.
|
|
|
|
---
|
|
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
Index: xen-4.6.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
+++ xen-4.6.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
@@ -38,6 +38,9 @@
|
|
#include <xen/interface/hvm/params.h>
|
|
#include <xen/features.h>
|
|
#include <xen/evtchn.h>
|
|
+#ifdef HAVE_XEN_PVONHVM_UNPLUG
|
|
+#include <xen/xen_pvonhvm.h>
|
|
+#endif
|
|
#ifdef __ia64__
|
|
#include <asm/xen/xencomm.h>
|
|
#endif
|
|
@@ -289,6 +292,18 @@ static int check_platform_magic(struct d
|
|
short magic, unplug = 0;
|
|
char protocol, *p, *q, *err;
|
|
|
|
+#ifdef HAVE_XEN_PVONHVM_UNPLUG
|
|
+ if (xen_pvonhvm_unplug) {
|
|
+ /* Use kernel cmdline setting */
|
|
+ if (dev_unplug)
|
|
+ printk(KERN_INFO DRV_NAME ": ignoring option dev_unplug=%s \n", dev_unplug);
|
|
+ dev_unplug = NULL;
|
|
+ if (xen_pvonhvm_unplugged_disks)
|
|
+ unplug |= UNPLUG_ALL_IDE_DISKS | UNPLUG_AUX_IDE_DISKS;
|
|
+ if (xen_pvonhvm_unplugged_nics)
|
|
+ unplug |= UNPLUG_ALL_NICS;
|
|
+ } else
|
|
+#endif
|
|
/* Unconditionally unplug everything */
|
|
if (!dev_unplug)
|
|
unplug = UNPLUG_ALL;
|