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

Updating link to change in openSUSE:Factory/xen revision 99.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=87c8ac43897718b61dbcbca0296d6c2a
This commit is contained in:
OBS User buildservice-autocommit
2010-09-27 22:07:21 +00:00
committed by Git OBS Bridge
parent 06b9899ef9
commit 163148b426
186 changed files with 2359 additions and 5185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
blktap-pv-cdrom.patch
View File

@@ -1,7 +1,7 @@
Index: xen-4.0.0-testing/tools/blktap/drivers/block-cdrom.c
Index: xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
===================================================================
--- /dev/null
+++ xen-4.0.0-testing/tools/blktap/drivers/block-cdrom.c
+++ xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
@@ -0,0 +1,535 @@
+/* block-cdrom.c
+ *
@@ -538,10 +538,10 @@ Index: xen-4.0.0-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.0-testing/xen/include/public/io/cdromif.h
Index: xen-4.0.1-testing/xen/include/public/io/cdromif.h
===================================================================
--- /dev/null
+++ xen-4.0.0-testing/xen/include/public/io/cdromif.h
+++ xen-4.0.1-testing/xen/include/public/io/cdromif.h
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * cdromif.h
@@ -665,10 +665,10 @@ Index: xen-4.0.0-testing/xen/include/public/io/cdromif.h
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
+
+#endif
Index: xen-4.0.0-testing/tools/blktap/drivers/Makefile
Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile
===================================================================
--- xen-4.0.0-testing.orig/tools/blktap/drivers/Makefile
+++ xen-4.0.0-testing/tools/blktap/drivers/Makefile
--- xen-4.0.1-testing.orig/tools/blktap/drivers/Makefile
+++ xen-4.0.1-testing/tools/blktap/drivers/Makefile
@@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR
MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
endif
@@ -676,7 +676,7 @@ Index: xen-4.0.0-testing/tools/blktap/drivers/Makefile
-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread
-LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
+LDFLAGS_xen := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
+LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread
+LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread $(LDFLAGS_xen)
+LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDFLAGS_xen)
BLK-OBJS-y := block-aio.o
@@ -689,10 +689,10 @@ Index: xen-4.0.0-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.0-testing/tools/blktap/drivers/tapdisk.h
Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h
===================================================================
--- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.h
+++ xen-4.0.0-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
@@ -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.0-testing/tools/blktap/drivers/tapdisk.h
};
typedef struct driver_list_entry {
Index: xen-4.0.0-testing/tools/blktap/lib/blktaplib.h
Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h
===================================================================
--- xen-4.0.0-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-4.0.0-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
@@ -220,6 +220,7 @@ typedef struct msg_pid {
#define DISK_TYPE_RAM 3
#define DISK_TYPE_QCOW 4
@@ -749,10 +749,10 @@ Index: xen-4.0.0-testing/tools/blktap/lib/blktaplib.h
/* xenstore/xenbus: */
#define DOMNAME "Domain-0"
Index: xen-4.0.0-testing/xen/include/public/io/blkif.h
Index: xen-4.0.1-testing/xen/include/public/io/blkif.h
===================================================================
--- xen-4.0.0-testing.orig/xen/include/public/io/blkif.h
+++ xen-4.0.0-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
@@ -76,6 +76,10 @@
* "feature-flush-cache" node!
*/
@@ -764,10 +764,10 @@ Index: xen-4.0.0-testing/xen/include/public/io/blkif.h
/*
* Maximum scatter/gather segments per request.
Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.c
Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c
===================================================================
--- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.c
+++ xen-4.0.0-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
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
goto out;
}
@@ -791,10 +791,10 @@ Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.c
default:
DPRINTF("Unknown block operation\n");
break;
Index: xen-4.0.0-testing/tools/python/xen/xend/server/BlktapController.py
Index: xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
===================================================================
--- xen-4.0.0-testing.orig/tools/python/xen/xend/server/BlktapController.py
+++ xen-4.0.0-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
@@ -20,6 +20,7 @@ blktap1_disk_types = [
'ram',
'qcow',