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

blktap-pv-cdrom.patch

@@ -1,5 +1,7 @@
+Index: xen-3.4.0-testing/tools/blktap/drivers/block-cdrom.c
+===================================================================
 --- /dev/null
-+++ b/tools/blktap/drivers/block-cdrom.c
++++ xen-3.4.0-testing/tools/blktap/drivers/block-cdrom.c
 @@ -0,0 +1,536 @@
 +/* block-cdrom.c
 + *
@@ -537,8 +539,10 @@
 +	.td_get_parent_id    = tdcdrom_get_parent_id,
 +	.td_validate_parent  = tdcdrom_validate_parent
 +};
+Index: xen-3.4.0-testing/xen/include/public/io/cdromif.h
+===================================================================
 --- /dev/null
-+++ b/xen/include/public/io/cdromif.h
++++ xen-3.4.0-testing/xen/include/public/io/cdromif.h
 @@ -0,0 +1,120 @@
 +/******************************************************************************
 + * cdromif.h
@@ -660,10 +664,12 @@
 +            sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
 +
 +#endif
---- 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 ***)
+Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile
+===================================================================
+--- xen-3.4.0-testing.orig/tools/blktap/drivers/Makefile
++++ xen-3.4.0-testing/tools/blktap/drivers/Makefile
+@@ -20,8 +20,9 @@ CRYPT_LIB := -lcrypto
+ $(warning === libgcrypt not installed: falling back to libcrypto ===)
  endif
  
 -LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib -lblktap
@@ -674,7 +680,7 @@
  
  BLK-OBJS-y  := block-aio.o
  BLK-OBJS-y  += block-sync.o
-@@ -33,6 +34,7 @@ BLK-OBJS-y  += block-vmdk.o
+@@ -29,6 +30,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
@@ -682,8 +688,10 @@
  BLK-OBJS-y  += aes.o
  BLK-OBJS-y  += tapaio.o
  BLK-OBJS-$(CONFIG_Linux) += blk_linux.o
---- a/tools/blktap/drivers/tapdisk.h
-+++ b/tools/blktap/drivers/tapdisk.h
+Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.h
+===================================================================
+--- xen-3.4.0-testing.orig/tools/blktap/drivers/tapdisk.h
++++ xen-3.4.0-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, 
@@ -702,7 +710,7 @@
  
  
  /*Define Individual Disk Parameters here */
-@@ -240,6 +244,17 @@ static disk_info_t ioemu_disk = {
+@@ -229,6 +233,17 @@ static disk_info_t qcow2_disk = {
  #endif
  };
  
@@ -720,26 +728,30 @@
  /*Main disk info array */
  static disk_info_t *dtypes[] = {
  	&aio_disk,
-@@ -249,6 +264,7 @@ static disk_info_t *dtypes[] = {
+@@ -237,6 +252,7 @@ static disk_info_t *dtypes[] = {
+ 	&ram_disk,
  	&qcow_disk,
  	&qcow2_disk,
- 	&ioemu_disk,
 +	&cdrom_disk,
  };
  
  typedef struct driver_list_entry {
---- a/tools/blktap/lib/blktaplib.h
-+++ b/tools/blktap/lib/blktaplib.h
-@@ -221,6 +221,7 @@ typedef struct msg_pid {
+Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
+===================================================================
+--- xen-3.4.0-testing.orig/tools/blktap/lib/blktaplib.h
++++ xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
+@@ -220,6 +220,7 @@ typedef struct msg_pid {
+ #define DISK_TYPE_RAM      3
  #define DISK_TYPE_QCOW     4
  #define DISK_TYPE_QCOW2    5
- #define DISK_TYPE_IOEMU    6
-+#define DISK_TYPE_CDROM    7
++#define DISK_TYPE_CDROM    6
  
  /* xenstore/xenbus: */
  #define DOMNAME "Domain-0"
---- a/xen/include/public/io/blkif.h
-+++ b/xen/include/public/io/blkif.h
+Index: xen-3.4.0-testing/xen/include/public/io/blkif.h
+===================================================================
+--- xen-3.4.0-testing.orig/xen/include/public/io/blkif.h
++++ xen-3.4.0-testing/xen/include/public/io/blkif.h
 @@ -76,6 +76,10 @@
   * "feature-flush-cache" node!
   */
@@ -751,8 +763,10 @@
  
  /*
   * Maximum scatter/gather segments per request.
---- a/tools/blktap/drivers/tapdisk.c
-+++ b/tools/blktap/drivers/tapdisk.c
+Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.c
+===================================================================
+--- xen-3.4.0-testing.orig/tools/blktap/drivers/tapdisk.c
++++ xen-3.4.0-testing/tools/blktap/drivers/tapdisk.c
 @@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
  					goto out;
  				}
@@ -776,16 +790,15 @@
  			default:
  				DPRINTF("Unknown block operation\n");
  				break;
---- a/tools/python/xen/xend/server/BlktapController.py
-+++ b/tools/python/xen/xend/server/BlktapController.py
-@@ -14,8 +14,8 @@ blktap_disk_types = [
+Index: xen-3.4.0-testing/tools/python/xen/xend/server/BlktapController.py
+===================================================================
+--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/BlktapController.py
++++ xen-3.4.0-testing/tools/python/xen/xend/server/BlktapController.py
+@@ -14,6 +14,7 @@ blktap_disk_types = [
      'ram',
      'qcow',
      'qcow2',
--
--    'ioemu'
-+    'ioemu',
 +    'cdrom',
-     ]
  
- class BlktapController(BlkifController):
+     'ioemu',
+     'tapdisk',