projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | Subject: backward compatibility |
| 2 | From: Gerd Hoffmann <kraxel@suse.de> | |
| 3 | Patch-mainline: obsolete | |
| 4 | ||
| 5 | --- | |
| 6 | linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c | 6 ++++++ | |
| 7 | linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c | 6 ++++++ | |
| 8 | 2 files changed, 12 insertions(+) | |
| 9 | ||
| 10 | Index: head-2008-09-15/drivers/xen/blkback/xenbus.c | |
| 11 | =================================================================== | |
| 12 | --- head-2008-09-15.orig/drivers/xen/blkback/xenbus.c 2008-09-15 14:32:56.000000000 +0200 | |
| 13 | +++ head-2008-09-15/drivers/xen/blkback/xenbus.c 2008-09-15 15:10:36.000000000 +0200 | |
| 14 | @@ -496,6 +496,12 @@ static int connect_ring(struct backend_i | |
| 15 | be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32; | |
| 16 | else if (0 == strcmp(protocol, XEN_IO_PROTO_ABI_X86_64)) | |
| 17 | be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64; | |
| 18 | +#if 1 /* maintain compatibility with early sles10-sp1 and paravirt netware betas */ | |
| 19 | + else if (0 == strcmp(protocol, "1")) | |
| 20 | + be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32; | |
| 21 | + else if (0 == strcmp(protocol, "2")) | |
| 22 | + be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64; | |
| 23 | +#endif | |
| 24 | else { | |
| 25 | xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol); | |
| 26 | return -1; | |
| 27 | Index: head-2008-09-15/drivers/xen/blktap/xenbus.c | |
| 28 | =================================================================== | |
| 29 | --- head-2008-09-15.orig/drivers/xen/blktap/xenbus.c 2008-09-15 14:32:56.000000000 +0200 | |
| 30 | +++ head-2008-09-15/drivers/xen/blktap/xenbus.c 2008-09-15 15:10:36.000000000 +0200 | |
| 31 | @@ -434,6 +434,12 @@ static int connect_ring(struct backend_i | |
| 32 | be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32; | |
| 33 | else if (0 == strcmp(protocol, XEN_IO_PROTO_ABI_X86_64)) | |
| 34 | be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64; | |
| 35 | +#if 1 /* maintain compatibility with early sles10-sp1 and paravirt netware betas */ | |
| 36 | + else if (0 == strcmp(protocol, "1")) | |
| 37 | + be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_32; | |
| 38 | + else if (0 == strcmp(protocol, "2")) | |
| 39 | + be->blkif->blk_protocol = BLKIF_PROTOCOL_X86_64; | |
| 40 | +#endif | |
| 41 | else { | |
| 42 | xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol); | |
| 43 | return -1; |