summaryrefslogtreecommitdiffstats
path: root/xen-blkfront-name-adjust.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-16 10:28:25 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-16 10:31:40 -0400
commitbc12142e94b6bc3c20e422e596cff4d0426c3be7 (patch)
tree39eaaae2dd0d0cfd3eb3521abd6428e40f05645a /xen-blkfront-name-adjust.patch
parent8ffa0afd4c9c71c3ee7ed3b8310bada71259173a (diff)
downloadkernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.gz
kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.xz
kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.zip
Add a few patches that were in f16 but not in rawhide
Diffstat (limited to 'xen-blkfront-name-adjust.patch')
-rw-r--r--xen-blkfront-name-adjust.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/xen-blkfront-name-adjust.patch b/xen-blkfront-name-adjust.patch
new file mode 100644
index 000000000..9573c7bf5
--- /dev/null
+++ b/xen-blkfront-name-adjust.patch
@@ -0,0 +1,30 @@
+commit 196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9
+Author: Stefan Bader <stefan.bader@canonical.com>
+Date: Thu Jul 14 15:30:22 2011 +0200
+
+ xen-blkfront: Drop name and minor adjustments for emulated scsi devices
+
+ These were intended to avoid the namespace clash when representing
+ emulated IDE and SCSI devices. However that seems to confuse users
+ more than expected (a disk defined as sda becomes xvde).
+ So for now go back to the scheme which does no adjustments. This
+ will break when mixing IDE and SCSI names in the configuration of
+ guests but should be by now expected.
+
+ Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
+ Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
+ Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+
+--- linux-2.6.39.noarch/drivers/block/xen-blkfront.c~ 2011-08-11 11:54:25.656150889 -0400
++++ linux-2.6.39.noarch/drivers/block/xen-blkfront.c 2011-08-11 11:54:54.573046334 -0400
+@@ -123,8 +123,8 @@ static DEFINE_SPINLOCK(minor_lock);
+ #define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED))
+ #define EMULATED_HD_DISK_MINOR_OFFSET (0)
+ #define EMULATED_HD_DISK_NAME_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET / 256)
+-#define EMULATED_SD_DISK_MINOR_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET + (4 * 16))
+-#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_HD_DISK_NAME_OFFSET + 4)
++#define EMULATED_SD_DISK_MINOR_OFFSET (0)
++#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_SD_DISK_MINOR_OFFSET / 256)
+
+ #define DEV_NAME "xvd" /* name in /dev */
+