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=69

Browse Source
This commit is contained in:
OBS User unknown
2009-02-09 01:49:08 +00:00
committed by Git OBS Bridge
parent 8a8c811c02
commit 5545adae8a
19 changed files with 2092 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
blktap-pv-cdrom.patch
View File

@@ -1,8 +1,6 @@
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-28 13:14:49.000000000 -0600
@@ -0,0 +1,535 @@
--- /dev/null
+++ b/tools/blktap/drivers/block-cdrom.c
@@ -0,0 +1,536 @@
+/* block-cdrom.c
+ *
+ * simple slow synchronous cdrom disk implementation. Based off
@@ -113,16 +111,17 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c
+ ioctl(prv->fd, BLKSSZGET, &s->sector_size);
+
+ if (s->sector_size != CDROM_DEFAULT_SECTOR_SIZE)
+ DPRINTF("Note: sector size is %ld (not %d)\n",
+ s->sector_size, CDROM_DEFAULT_SECTOR_SIZE);
+ DPRINTF("Note: sector size is %llu (not %d)\n",
+ (long long unsigned)s->sector_size,
+ CDROM_DEFAULT_SECTOR_SIZE);
+ }
+#else
+ s->sector_size = CDROM_DEFAULT_SECTOR_SIZE;
+#endif
+ DPRINTF("Block Device: Image size: %llu",
+ (long long unsigned)s->size);
+ DPRINTF("\t media_present: %d sector_size: %lu\n",
+ prv->media_present, s->sector_size);
+ DPRINTF("Block Device: Image size: %llu"
+ " media_present: %d sector_size: %llu\n",
+ (long long unsigned)s->size, prv->media_present,
+ (long long unsigned)s->sector_size);
+ } else {
+ /*Local file? try fstat instead*/
+ prv->dev_type = FILE_DEVICE;
@@ -538,10 +537,8 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/block-cdrom.c
+ .td_get_parent_id = tdcdrom_get_parent_id,
+ .td_validate_parent = tdcdrom_validate_parent
+};
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-28 13:11:57.000000000 -0600
--- /dev/null
+++ b/xen/include/public/io/cdromif.h
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * cdromif.h
@@ -663,11 +660,9 @@ Index: xen-3.3.1-testing/xen/include/public/io/cdromif.h
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
+
+#endif
Index: xen-3.3.1-testing/tools/blktap/drivers/Makefile
===================================================================
--- 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 @@
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -24,8 +24,9 @@ CRYPT_LIB := -lcrypto
$(warning *** libgcrypt not installed: falling back to libcrypto ***)
endif
@@ -679,7 +674,7 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/Makefile
BLK-OBJS-y := block-aio.o
BLK-OBJS-y += block-sync.o
@@ -33,6 +34,7 @@
@@ -33,6 +34,7 @@ BLK-OBJS-y += block-vmdk.o
BLK-OBJS-y += block-ram.o
BLK-OBJS-y += block-qcow.o
BLK-OBJS-y += block-qcow2.o
@@ -687,11 +682,9 @@ Index: xen-3.3.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-3.3.1-testing/tools/blktap/drivers/tapdisk.h
===================================================================
--- 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 @@
--- a/tools/blktap/drivers/tapdisk.h
+++ b/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,
struct disk_driver *p, td_flag_t flags);
@@ -701,7 +694,7 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h
};
typedef struct disk_info {
@@ -160,6 +163,7 @@
@@ -160,6 +163,7 @@ extern struct tap_disk tapdisk_vmdk;
extern struct tap_disk tapdisk_ram;
extern struct tap_disk tapdisk_qcow;
extern struct tap_disk tapdisk_qcow2;
@@ -709,7 +702,7 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h
/*Define Individual Disk Parameters here */
@@ -240,6 +244,17 @@
@@ -240,6 +244,17 @@ static disk_info_t ioemu_disk = {
#endif
};
@@ -727,7 +720,7 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.h
/*Main disk info array */
static disk_info_t *dtypes[] = {
&aio_disk,
@@ -249,6 +264,7 @@
@@ -249,6 +264,7 @@ static disk_info_t *dtypes[] = {
&qcow_disk,
&qcow2_disk,
&ioemu_disk,
@@ -735,11 +728,9 @@ 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-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 @@
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -221,6 +221,7 @@ typedef struct msg_pid {
#define DISK_TYPE_QCOW 4
#define DISK_TYPE_QCOW2 5
#define DISK_TYPE_IOEMU 6
@@ -747,10 +738,8 @@ Index: xen-3.3.1-testing/tools/blktap/lib/blktaplib.h
/* xenstore/xenbus: */
#define DOMNAME "Domain-0"
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-28 13:11:57.000000000 -0600
--- a/xen/include/public/io/blkif.h
+++ b/xen/include/public/io/blkif.h
@@ -76,6 +76,10 @@
* "feature-flush-cache" node!
*/
@@ -762,11 +751,9 @@ Index: xen-3.3.1-testing/xen/include/public/io/blkif.h
/*
* Maximum scatter/gather segments per request.
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-28 13:11:57.000000000 -0600
@@ -735,6 +735,22 @@
--- a/tools/blktap/drivers/tapdisk.c
+++ b/tools/blktap/drivers/tapdisk.c
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
goto out;
}
break;
@@ -789,11 +776,9 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/tapdisk.c
default:
DPRINTF("Unknown block operation\n");
break;
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-28 13:11:57.000000000 -0600
@@ -14,8 +14,8 @@
--- a/tools/python/xen/xend/server/BlktapController.py
+++ b/tools/python/xen/xend/server/BlktapController.py
@@ -14,8 +14,8 @@ blktap_disk_types = [
'ram',
'qcow',
'qcow2',