2010-07-07 11:12:45 +00:00
|
|
|
Subject: backward compatibility
|
|
|
|
|
From: Gerd Hoffmann <kraxel@suse.de>
|
|
|
|
|
Patch-mainline: obsolete
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c | 6 ++++++
|
|
|
|
|
linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c | 6 ++++++
|
|
|
|
|
2 files changed, 12 insertions(+)
|
|
|
|
|
|
2011-04-19 20:09:59 +00:00
|
|
|
--- head-2010-11-25.orig/drivers/xen/blkback/xenbus.c 2010-11-22 13:10:22.000000000 +0100
|
|
|
|
|
+++ head-2010-11-25/drivers/xen/blkback/xenbus.c 2010-11-25 10:57:03.000000000 +0100
|
|
|
|
|
@@ -506,6 +506,12 @@ static int connect_ring(struct backend_i
|
2010-07-07 11:12:45 +00:00
|
|
|
be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32;
|
|
|
|
|
else if (0 == strcmp(protocol, XEN_IO_PROTO_ABI_X86_64))
|
|
|
|
|
be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64;
|
|
|
|
|
+#if 1 /* maintain compatibility with early sles10-sp1 and paravirt netware betas */
|
|
|
|
|
+ else if (0 == strcmp(protocol, "1"))
|
|
|
|
|
+ be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32;
|
|
|
|
|
+ else if (0 == strcmp(protocol, "2"))
|
|
|
|
|
+ be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64;
|
|
|
|
|
+#endif
|
|
|
|
|
else {
|
|
|
|
|
xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol);
|
|
|
|
|
return -1;
|
2011-04-19 20:09:59 +00:00
|
|
|
--- head-2010-11-25.orig/drivers/xen/blktap/xenbus.c 2010-11-25 10:28:23.000000000 +0100
|
|
|
|
|
+++ head-2010-11-25/drivers/xen/blktap/xenbus.c 2010-11-25 10:57:00.000000000 +0100
|
|
|
|
|
@@ -457,6 +457,12 @@ static int connect_ring(struct backend_i
|
2010-07-07 11:12:45 +00:00
|
|
|
be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32;
|
|
|
|
|
else if (0 == strcmp(protocol, XEN_IO_PROTO_ABI_X86_64))
|
|
|
|
|
be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64;
|
|
|
|
|
+#if 1 /* maintain compatibility with early sles10-sp1 and paravirt netware betas */
|
|
|
|
|
+ else if (0 == strcmp(protocol, "1"))
|
|
|
|
|
+ be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32;
|
|
|
|
|
+ else if (0 == strcmp(protocol, "2"))
|
|
|
|
|
+ be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64;
|
|
|
|
|
+#endif
|
|
|
|
|
else {
|
|
|
|
|
xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol);
|
|
|
|
|
return -1;
|
