From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Tue, 9 Sep 2008 11:51:08 +0000 (+0100)
Subject: Minor fixes to CCISS support.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d9eeebe35bedea60b31d9a642c02fe0e203141d3;p=virt-p2v.git

Minor fixes to CCISS support.
---

diff --git a/virt-p2v b/virt-p2v
index 954f035..67cd4cf 100755
--- a/virt-p2v
+++ b/virt-p2v
@@ -689,7 +689,7 @@ let get_all_block_devices () =
   let devices = devices @ get "sd" filter in
 
   (* Search for cciss. *)
-  let rex = Pcre.regexp "^cciss!c(\\d)d(\\d)$" in
+  let rex = Pcre.regexp "^cciss!c(\\d+)d(\\d+)$" in
   let filter name =
     try
       let subs = Pcre.exec ~rex name in
@@ -2052,7 +2052,8 @@ let rec main ttyname =
 
       let () =
 	printf (f_ "\nSending /dev/%s (%.3f GB) to remote machine\n\n%!")
-	  origin_dev ((Int64.to_float size) /. (1024.*.1024.*.1024.)) in
+	  (dev_of_block_device origin_dev)
+	  ((Int64.to_float size) /. (1024.*.1024.*.1024.)) in
 
       (* Open the snapshot device. *)
       let fd = openfile ("/dev/mapper/" ^ snapshot_dev) [O_RDONLY] 0 in