rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=55

Browse Source
This commit is contained in:
OBS User unknown
2008-10-11 14:22:01 +00:00
committed by Git OBS Bridge
parent b834258fb8
commit 71babd6d75
37 changed files with 1751 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
blktap-pv-cdrom.patch
View File

@@ -1,8 +1,8 @@
Index: xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c 2008-09-24 09:45:02.000000000 -0600
@@ -0,0 +1,539 @@
+++ xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c 2008-09-28 13:14:49.000000000 -0600
@@ -0,0 +1,535 @@
+/* block-cdrom.c
+ *
+ * simple slow synchronous cdrom disk implementation. Based off
@@ -153,18 +153,14 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c
+ struct tdcdrom_state *prv = (struct tdcdrom_state *)dd->private;
+ int o_flags;
+
+ o_flags = O_NONBLOCK | O_DIRECT | O_LARGEFILE |
+ o_flags = O_NONBLOCK | O_LARGEFILE |
+ ((prv->flags == TD_RDONLY) ? O_RDONLY : O_RDWR);
+
+ if (prv->fd < 0) {
+ prv->fd = open(prv->dev_name, o_flags);
+ if ( (prv->fd == -1) && (errno == EINVAL) ) {
+ /* Maybe O_DIRECT isn't supported. */
+ o_flags &= ~O_DIRECT;
+ prv->fd = open(prv->dev_name, o_flags);
+ if (prv->fd != -1) {
+ DPRINTF("WARNING: Accessing image without O_DIRECT! (%s)\n", prv->dev_name);
+ }
+ if (prv->fd == -1) {
+ DPRINTF("Unable tp open: (%s)\n", prv->dev_name);
+ return;
+ }
+ }
+
@@ -545,7 +541,7 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c
Index: xen-3.3.1-testing/xen/include/public/io/cdromif.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xen-3.3.1-testing/xen/include/public/io/cdromif.h 2008-09-24 09:42:05.000000000 -0600
+++ xen-3.3.1-testing/xen/include/public/io/cdromif.h 2008-09-28 13:11:57.000000000 -0600
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * cdromif.h
@@ -669,8 +665,8 @@ Index: xen-3.3.1-testing/xen/include/public/io/cdromif.h
+#endif
Index: xen-3.3.1-testing/tools/blktap/drivers/Makefile
===================================================================
--- xen-3.3.1-testing.orig/tools/blktap/drivers/Makefile 2008-09-23 06:52:48.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/drivers/Makefile 2008-09-23 06:52:50.000000000 -0600
--- xen-3.3.1-testing.orig/tools/blktap/drivers/Makefile 2008-09-28 13:11:54.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/drivers/Makefile 2008-09-28 13:11:57.000000000 -0600
@@ -24,8 +24,9 @@
$(warning *** libgcrypt not installed: falling back to libcrypto ***)
endif
@@ -693,8 +689,8 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/Makefile
BLK-OBJS-$(CONFIG_Linux) += blk_linux.o
Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h
===================================================================
--- xen-3.3.1-testing.orig/tools/blktap/drivers/tapdisk.h 2008-09-23 06:52:50.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h 2008-09-23 06:52:50.000000000 -0600
--- xen-3.3.1-testing.orig/tools/blktap/drivers/tapdisk.h 2008-09-28 13:11:56.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h 2008-09-28 13:11:57.000000000 -0600
@@ -137,6 +137,9 @@
int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id);
int (*td_validate_parent)(struct disk_driver *dd,
@@ -741,8 +737,8 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h
typedef struct driver_list_entry {
Index: xen-3.3.1-testing/tools/blktap/lib/blktaplib.h
===================================================================
--- xen-3.3.1-testing.orig/tools/blktap/lib/blktaplib.h 2008-09-23 06:52:50.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/lib/blktaplib.h 2008-09-23 06:52:50.000000000 -0600
--- xen-3.3.1-testing.orig/tools/blktap/lib/blktaplib.h 2008-09-28 13:11:56.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/lib/blktaplib.h 2008-09-28 13:11:57.000000000 -0600
@@ -221,6 +221,7 @@
#define DISK_TYPE_QCOW 4
#define DISK_TYPE_QCOW2 5
@@ -754,7 +750,7 @@ Index: xen-3.3.1-testing/tools/blktap/lib/blktaplib.h
Index: xen-3.3.1-testing/xen/include/public/io/blkif.h
===================================================================
--- xen-3.3.1-testing.orig/xen/include/public/io/blkif.h 2008-09-16 10:31:07.000000000 -0600
+++ xen-3.3.1-testing/xen/include/public/io/blkif.h 2008-09-23 06:54:18.000000000 -0600
+++ xen-3.3.1-testing/xen/include/public/io/blkif.h 2008-09-28 13:11:57.000000000 -0600
@@ -76,6 +76,10 @@
* "feature-flush-cache" node!
*/
@@ -769,7 +765,7 @@ Index: xen-3.3.1-testing/xen/include/public/io/blkif.h
Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.c
===================================================================
--- xen-3.3.1-testing.orig/tools/blktap/drivers/tapdisk.c 2008-09-16 10:31:02.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/drivers/tapdisk.c 2008-09-23 06:56:45.000000000 -0600
+++ xen-3.3.1-testing/tools/blktap/drivers/tapdisk.c 2008-09-28 13:11:57.000000000 -0600
@@ -735,6 +735,22 @@
goto out;
}
@@ -796,7 +792,7 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.c
Index: xen-3.3.1-testing/tools/python/xen/xend/server/BlktapController.py
===================================================================
--- xen-3.3.1-testing.orig/tools/python/xen/xend/server/BlktapController.py 2008-09-16 10:31:03.000000000 -0600
+++ xen-3.3.1-testing/tools/python/xen/xend/server/BlktapController.py 2008-09-23 07:02:27.000000000 -0600
+++ xen-3.3.1-testing/tools/python/xen/xend/server/BlktapController.py 2008-09-28 13:11:57.000000000 -0600
@@ -14,8 +14,8 @@
'ram',
'qcow',