diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-02-09 02:27:15 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-02-09 02:27:15 +0100 |
| commit | 3d095d907e0047621950b3dcd9ff8b1f3d596797 (patch) | |
| tree | 3b925d4c5ef6608e2168ae468d5fb54e8b0d04e0 | |
| parent | aaf803372bd4b30b97a2039e4b1b36b07c0a7250 (diff) | |
xen block: Add more legacy hd* name support
* xen/block.c (hyp_block_init): Add IDE 3-10 device number recognition. Skip
unknown block device numbers.
| -rw-r--r-- | xen/block.c | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/xen/block.c b/xen/block.c index 76119e8..4718891 100644 --- a/xen/block.c +++ b/xen/block.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Samuel Thibault <samuel.thibault@ens-lyon.org> + * Copyright (C) 2006-2009, 2011 Samuel Thibault <samuel.thibault@ens-lyon.org> * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -158,16 +158,59 @@ void hyp_block_init(void) { prefix = "sd"; disk = (i >> 4) & ((1 << 4) - 1); partition = i & ((1 << 4) - 1); + } else if ((i >> 8) == 3) { + /* IDE primary */ + prefix = "hd"; + disk = (i >> 6) & ((1 << 2) - 1); + partition = i & ((1 << 6) - 1); } else if ((i >> 8) == 22) { /* IDE secondary */ prefix = "hd"; disk = ((i >> 6) & ((1 << 2) - 1)) + 2; partition = i & ((1 << 6) - 1); - } else if ((i >> 8) == 3) { - /* IDE primary */ + } else if ((i >> 8) == 33) { + /* IDE 3 */ prefix = "hd"; - disk = (i >> 6) & ((1 << 2) - 1); + disk = ((i >> 6) & ((1 << 2) - 1)) + 4; + partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 34) { + /* IDE 4 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 6; + partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 56) { + /* IDE 5 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 8; partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 57) { + /* IDE 6 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 10; + partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 88) { + /* IDE 7 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 12; + partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 89) { + /* IDE 8 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 14; + partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 90) { + /* IDE 9 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 16; + partition = i & ((1 << 6) - 1); + } else if ((i >> 8) == 91) { + /* IDE 10 */ + prefix = "hd"; + disk = ((i >> 6) & ((1 << 2) - 1)) + 18; + partition = i & ((1 << 6) - 1); + } else { + printf("unsupported VBD number %d\n", i); + continue; } if (partition) sprintf(device_name, "%s%us%u", prefix, disk, partition); |