- Update to Xen 4.0.2 rc2-pre, changeset 21443
- 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
This commit is contained in:
committed by
Git OBS Bridge
parent
62de63b129
commit
0c76f22ef1
@@ -1,7 +1,7 @@
|
||||
Index: xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
Index: xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
+++ xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c
|
||||
@@ -0,0 +1,535 @@
|
||||
+/* block-cdrom.c
|
||||
+ *
|
||||
@@ -538,10 +538,10 @@ Index: xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
+ .td_get_parent_id = tdcdrom_get_parent_id,
|
||||
+ .td_validate_parent = tdcdrom_validate_parent
|
||||
+};
|
||||
Index: xen-4.0.1-testing/xen/include/public/io/cdromif.h
|
||||
Index: xen-4.0.2-testing/xen/include/public/io/cdromif.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ xen-4.0.1-testing/xen/include/public/io/cdromif.h
|
||||
+++ xen-4.0.2-testing/xen/include/public/io/cdromif.h
|
||||
@@ -0,0 +1,122 @@
|
||||
+/******************************************************************************
|
||||
+ * cdromif.h
|
||||
@@ -665,10 +665,10 @@ Index: xen-4.0.1-testing/xen/include/public/io/cdromif.h
|
||||
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
|
||||
+
|
||||
+#endif
|
||||
Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile
|
||||
Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile
|
||||
===================================================================
|
||||
--- xen-4.0.1-testing.orig/tools/blktap/drivers/Makefile
|
||||
+++ xen-4.0.1-testing/tools/blktap/drivers/Makefile
|
||||
--- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile
|
||||
+++ xen-4.0.2-testing/tools/blktap/drivers/Makefile
|
||||
@@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR
|
||||
MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
|
||||
endif
|
||||
@@ -689,10 +689,10 @@ Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile
|
||||
BLK-OBJS-y += aes.o
|
||||
BLK-OBJS-y += tapaio.o
|
||||
BLK-OBJS-$(CONFIG_Linux) += blk_linux.o
|
||||
Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h
|
||||
Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
|
||||
===================================================================
|
||||
--- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.h
|
||||
+++ xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h
|
||||
--- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.h
|
||||
+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
|
||||
@@ -137,6 +137,9 @@ struct tap_disk {
|
||||
int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id);
|
||||
int (*td_validate_parent)(struct disk_driver *dd,
|
||||
@@ -737,10 +737,10 @@ Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h
|
||||
};
|
||||
|
||||
typedef struct driver_list_entry {
|
||||
Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h
|
||||
Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
|
||||
===================================================================
|
||||
--- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h
|
||||
+++ xen-4.0.1-testing/tools/blktap/lib/blktaplib.h
|
||||
--- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h
|
||||
+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
|
||||
@@ -225,6 +225,7 @@ typedef struct msg_pid {
|
||||
#define DISK_TYPE_RAM 3
|
||||
#define DISK_TYPE_QCOW 4
|
||||
@@ -749,10 +749,10 @@ Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h
|
||||
|
||||
/* xenstore/xenbus: */
|
||||
#define DOMNAME "Domain-0"
|
||||
Index: xen-4.0.1-testing/xen/include/public/io/blkif.h
|
||||
Index: xen-4.0.2-testing/xen/include/public/io/blkif.h
|
||||
===================================================================
|
||||
--- xen-4.0.1-testing.orig/xen/include/public/io/blkif.h
|
||||
+++ xen-4.0.1-testing/xen/include/public/io/blkif.h
|
||||
--- xen-4.0.2-testing.orig/xen/include/public/io/blkif.h
|
||||
+++ xen-4.0.2-testing/xen/include/public/io/blkif.h
|
||||
@@ -76,6 +76,10 @@
|
||||
* "feature-flush-cache" node!
|
||||
*/
|
||||
@@ -764,10 +764,10 @@ Index: xen-4.0.1-testing/xen/include/public/io/blkif.h
|
||||
|
||||
/*
|
||||
* Maximum scatter/gather segments per request.
|
||||
Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c
|
||||
Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c
|
||||
===================================================================
|
||||
--- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.c
|
||||
+++ xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c
|
||||
--- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.c
|
||||
+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c
|
||||
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
|
||||
goto out;
|
||||
}
|
||||
@@ -791,10 +791,10 @@ Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c
|
||||
default:
|
||||
DPRINTF("Unknown block operation\n");
|
||||
break;
|
||||
Index: xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
Index: xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
===================================================================
|
||||
--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/BlktapController.py
|
||||
+++ xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
--- xen-4.0.2-testing.orig/tools/python/xen/xend/server/BlktapController.py
|
||||
+++ xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
@@ -21,6 +21,7 @@ blktap1_disk_types = [
|
||||
'ram',
|
||||
'qcow',
|
||||
|
Reference in New Issue
Block a user