mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
bitkeeper revision 1.1236.1.53 (42277c41EuPccbqmVurI0fsfmSfYuA)
fix conflict.
This commit is contained in:
akw27@arcadians.cl.cam.ac.uk committed
commit
4b93b36dc6
20 files changed
+2485
-10
No files matched your search
@@ -369,7 +369,7 @@ class BlkDev(controller.SplitDev):
|
||||
# Add a new disk type that will just pass an opaque id in the
|
||||
# start_sector and use an experimental device type.
|
||||
# Please contact andrew.warfield@cl.cam.ac.uk with any concerns.
|
||||
if self.type == 'amorfs':
|
||||
if self.type == 'parallax':
|
||||
self.node = node
|
||||
self.device = 61440 # (240,0)
|
||||
self.start_sector = long(self.params)
|
||||
|
||||