qubes-linux-kernel/patches.xen/xen-blkback-bimodal-suse
2010-07-07 13:12:45 +02:00

40 lines
1.8 KiB
Plaintext

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(+)
--- head-2010-04-29.orig/drivers/xen/blkback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+++ head-2010-04-29/drivers/xen/blkback/xenbus.c 2010-03-25 14:37:55.000000000 +0100
@@ -500,6 +500,12 @@ static int connect_ring(struct backend_i
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;
--- head-2010-04-29.orig/drivers/xen/blktap/xenbus.c 2010-04-29 09:52:52.000000000 +0200
+++ head-2010-04-29/drivers/xen/blktap/xenbus.c 2010-04-29 10:15:25.000000000 +0200
@@ -441,6 +441,12 @@ static int connect_ring(struct backend_i
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;