0c76f22ef1
- bnc#633573 - System fail to boot after running several warm reboot tests 22749-vtd-workarounds.patch - Upstream patches from Jan 22744-ept-pod-locking.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22782-x86-emul-smsw.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 22816-x86-pirq-drop-priv-check.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
Index: xen-4.0.2-testing/extras/mini-os/netfront.c
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/extras/mini-os/netfront.c
|
|
+++ xen-4.0.2-testing/extras/mini-os/netfront.c
|
|
@@ -25,8 +25,8 @@ DECLARE_WAIT_QUEUE_HEAD(netfront_queue);
|
|
|
|
|
|
|
|
-#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
|
|
-#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
|
|
+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
|
|
+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
|
|
#define GRANT_INVALID_REF 0
|
|
|
|
|
|
Index: xen-4.0.2-testing/extras/mini-os/lib/math.c
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/extras/mini-os/lib/math.c
|
|
+++ xen-4.0.2-testing/extras/mini-os/lib/math.c
|
|
@@ -191,6 +191,7 @@ __qdivrem(uint64_t uq, uint64_t vq, uint
|
|
* and thus
|
|
* m = 4 - n <= 2
|
|
*/
|
|
+ tmp.ul[H] = tmp.ul[L] = 0;
|
|
tmp.uq = uq;
|
|
u[0] = 0;
|
|
u[1] = HHALF(tmp.ul[H]);
|
|
Index: xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/extras/mini-os/arch/x86/mm.c
|
|
+++ xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c
|
|
@@ -281,7 +281,7 @@ static void build_pagetable(unsigned lon
|
|
/*
|
|
* Mark portion of the address space read only.
|
|
*/
|
|
-extern void shared_info;
|
|
+extern char shared_info[PAGE_SIZE];
|
|
static void set_readonly(void *text, void *etext)
|
|
{
|
|
unsigned long start_address =
|