80e28a00ec
- unmodified_drivers: handle IRQF_SAMPLE_RANDOM, it was removed in 3.6-rc1 - bnc#778105 - first XEN-PV VM fails to spawn xend: Increase wait time for disk to appear in host bootloader Modified existing xen-domUloader.diff - Disable the snapshot patches. Snapshot only supported the qcow2 image format which was poorly implemented qemu 0.10.2. Snapshot support may be restored in the future when the newer upstream qemu is used by Xen. - bnc#776995 - attaching scsi control luns with pvscsi - xend/pvscsi: fix passing of SCSI control LUNs xen-bug776995-pvscsi-no-devname.patch - xend/pvscsi: fix usage of persistant device names for SCSI devices xen-bug776995-pvscsi-persistent-names.patch - xend/pvscsi: update sysfs parser for Linux 3.0 xen-bug776995-pvscsi-sysfs-parser.patch - Update to Xen 4.2.0 RC3+ c/s 25779 - Update to Xen 4.2.0 RC2+ c/s 25765 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=199
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
Index: xen-4.2.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
|
|
+++ xen-4.2.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
|
|
@@ -40,7 +40,9 @@
|
|
#include <xen/platform-compat.h>
|
|
#endif
|
|
|
|
+#ifndef shared_info_area
|
|
void *shared_info_area;
|
|
+#endif
|
|
|
|
#define is_valid_evtchn(x) ((x) != 0)
|
|
#define evtchn_from_irq(x) (irq_evtchn[irq].evtchn)
|
|
Index: xen-4.2.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
+++ xen-4.2.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
@@ -76,7 +76,6 @@ static uint64_t callback_via;
|
|
static int __devinit init_xen_info(void)
|
|
{
|
|
struct xen_add_to_physmap xatp;
|
|
- extern void *shared_info_area;
|
|
|
|
#ifdef __ia64__
|
|
xencomm_initialize();
|
|
@@ -84,6 +83,7 @@ static int __devinit init_xen_info(void)
|
|
|
|
setup_xen_features();
|
|
|
|
+#ifndef shared_info_area
|
|
shared_info_frame = alloc_xen_mmio(PAGE_SIZE) >> PAGE_SHIFT;
|
|
xatp.domid = DOMID_SELF;
|
|
xatp.idx = 0;
|
|
@@ -96,6 +96,11 @@ static int __devinit init_xen_info(void)
|
|
ioremap(shared_info_frame << PAGE_SHIFT, PAGE_SIZE);
|
|
if (shared_info_area == NULL)
|
|
panic("can't map shared info\n");
|
|
+#else
|
|
+ shared_info_frame = __pa(shared_info_area) >> PAGE_SHIFT;
|
|
+ printk(KERN_INFO "Using kernel provided shared info (pfn=%lx)\n",
|
|
+ shared_info_frame);
|
|
+#endif
|
|
|
|
return 0;
|
|
}
|
|
Index: xen-4.2.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
|
|
+++ xen-4.2.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
|
|
@@ -27,6 +27,11 @@
|
|
unsigned long alloc_xen_mmio(unsigned long len);
|
|
void platform_pci_resume(void);
|
|
|
|
+#ifdef CONFIG_ENLIGHTEN_SPINLOCKS
|
|
+#define shared_info_area xen_shared_info
|
|
+#endif
|
|
+extern void *shared_info_area;
|
|
+
|
|
extern struct pci_dev *xen_platform_pdev;
|
|
|
|
#endif /* _XEN_PLATFORM_PCI_H */
|