Updated xen patches taken from suse.

[ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.xen / xen-blkfront-cdrom

diff --git a/src/patches/60047_xen-blkfront-cdrom.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen-blkfront-cdrom
similarity index 89%
rename from src/patches/60047_xen-blkfront-cdrom.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen-blkfront-cdrom
index 22c76c0c28bf7a71d2b2530e9b6bfb0f516d1f96..1f8120e8c9eafdd3c4ce057ec2f29fd60b896a40 100644 (file)
--- a/src/patches/60047_xen-blkfront-cdrom.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen-blkfront-cdrom
@@ -3,10 +3,8 @@ Subject: implement forwarding of CD-ROM specific commands
 Patch-mainline: obsolete
 References: fate#300964
 
-Index: head-2008-10-24/drivers/cdrom/Makefile
-===================================================================
---- head-2008-10-24.orig/drivers/cdrom/Makefile        2008-10-24 14:05:33.000000000 +0200
-+++ head-2008-10-24/drivers/cdrom/Makefile     2008-10-01 16:35:07.000000000 +0200
+--- sle11-2009-06-04.orig/drivers/cdrom/Makefile       2009-06-04 10:17:48.000000000 +0200
++++ sle11-2009-06-04/drivers/cdrom/Makefile    2009-06-04 10:47:04.000000000 +0200
 @@ -9,6 +9,7 @@ obj-$(CONFIG_BLK_DEV_IDECD)    +=          
  obj-$(CONFIG_BLK_DEV_SR)      +=              cdrom.o
  obj-$(CONFIG_PARIDE_PCD)      +=              cdrom.o
@@ -15,10 +13,8 @@ Index: head-2008-10-24/drivers/cdrom/Makefile
  
  obj-$(CONFIG_VIOCD)           += viocd.o      cdrom.o
  obj-$(CONFIG_GDROM)           += gdrom.o      cdrom.o
-Index: head-2008-10-24/drivers/xen/blkfront/Makefile
-===================================================================
---- head-2008-10-24.orig/drivers/xen/blkfront/Makefile 2008-10-24 14:05:33.000000000 +0200
-+++ head-2008-10-24/drivers/xen/blkfront/Makefile      2008-10-01 16:35:07.000000000 +0200
+--- sle11-2009-06-04.orig/drivers/xen/blkfront/Makefile        2009-06-04 10:17:48.000000000 +0200
++++ sle11-2009-06-04/drivers/xen/blkfront/Makefile     2009-06-04 10:47:04.000000000 +0200
 @@ -1,5 +1,5 @@
  
  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)     := xenblk.o
@@ -26,11 +22,9 @@ Index: head-2008-10-24/drivers/xen/blkfront/Makefile
 -xenblk-objs := blkfront.o vbd.o
 +xenblk-objs := blkfront.o vbd.o vcd.o
  
-Index: head-2008-10-24/drivers/xen/blkfront/blkfront.c
-===================================================================
---- head-2008-10-24.orig/drivers/xen/blkfront/blkfront.c       2008-10-01 16:35:04.000000000 +0200
-+++ head-2008-10-24/drivers/xen/blkfront/blkfront.c    2008-10-01 16:35:07.000000000 +0200
-@@ -372,6 +372,8 @@ static void connect(struct blkfront_info
+--- sle11-2009-06-04.orig/drivers/xen/blkfront/blkfront.c      2009-06-04 10:46:54.000000000 +0200
++++ sle11-2009-06-04/drivers/xen/blkfront/blkfront.c   2009-06-04 10:47:04.000000000 +0200
+@@ -377,6 +377,8 @@ static void connect(struct blkfront_info
        add_disk(info->gd);
  
        info->is_ready = 1;
@@ -39,7 +33,7 @@ Index: head-2008-10-24/drivers/xen/blkfront/blkfront.c
  }
  
  /**
-@@ -402,6 +404,8 @@ static void blkfront_closing(struct xenb
+@@ -407,6 +409,8 @@ static void blkfront_closing(struct xenb
  
        xlvbd_sysfs_delif(info);
  
@@ -48,11 +42,9 @@ Index: head-2008-10-24/drivers/xen/blkfront/blkfront.c
        xlvbd_del(info);
  
   out:
-Index: head-2008-10-24/drivers/xen/blkfront/block.h
-===================================================================
---- head-2008-10-24.orig/drivers/xen/blkfront/block.h  2008-10-24 14:05:33.000000000 +0200
-+++ head-2008-10-24/drivers/xen/blkfront/block.h       2008-10-01 16:35:07.000000000 +0200
-@@ -154,4 +154,8 @@ static inline void xlvbd_sysfs_delif(str
+--- sle11-2009-06-04.orig/drivers/xen/blkfront/block.h 2009-06-04 10:21:09.000000000 +0200
++++ sle11-2009-06-04/drivers/xen/blkfront/block.h      2009-06-04 10:47:04.000000000 +0200
+@@ -155,4 +155,8 @@ static inline void xlvbd_sysfs_delif(str
  }
  #endif
  
@@ -61,10 +53,8 @@ Index: head-2008-10-24/drivers/xen/blkfront/block.h
 +extern void unregister_vcd(struct blkfront_info *info);
 +
  #endif /* __XEN_DRIVERS_BLOCK_H__ */
-Index: head-2008-10-24/drivers/xen/blkfront/vbd.c
-===================================================================
---- head-2008-10-24.orig/drivers/xen/blkfront/vbd.c    2008-10-24 14:05:33.000000000 +0200
-+++ head-2008-10-24/drivers/xen/blkfront/vbd.c 2008-10-24 14:08:33.000000000 +0200
+--- sle11-2009-06-04.orig/drivers/xen/blkfront/vbd.c   2009-06-04 10:21:09.000000000 +0200
++++ sle11-2009-06-04/drivers/xen/blkfront/vbd.c        2009-06-04 10:47:04.000000000 +0200
 @@ -281,7 +281,8 @@ xlvbd_add(blkif_sector_t capacity, int v
                goto out;
        info->mi = mi;
@@ -84,10 +74,8 @@ Index: head-2008-10-24/drivers/xen/blkfront/vbd.c
                if (offset < 26) {
                        sprintf(gd->disk_name, "%s%c",
                                 mi->type->diskname, 'a' + offset );
-Index: head-2008-10-24/drivers/xen/blkfront/vcd.c
-===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ head-2008-10-24/drivers/xen/blkfront/vcd.c 2008-10-01 16:35:07.000000000 +0200
++++ sle11-2009-06-04/drivers/xen/blkfront/vcd.c        2009-06-04 10:47:04.000000000 +0200
 @@ -0,0 +1,476 @@
 +/*******************************************************************************
 +* vcd.c
@@ -565,10 +553,8 @@ Index: head-2008-10-24/drivers/xen/blkfront/vcd.c
 +      spin_unlock(&vcd_disks_lock);
 +}
 +
-Index: head-2008-10-24/include/xen/interface/io/cdromif.h
-===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ head-2008-10-24/include/xen/interface/io/cdromif.h 2008-10-01 16:35:07.000000000 +0200
++++ sle11-2009-06-04/include/xen/interface/io/cdromif.h        2009-06-04 10:47:04.000000000 +0200
 @@ -0,0 +1,120 @@
 +/******************************************************************************
 + * cdromif.h