[OSSTEST PATCH 09/13] prepareguest: Tolerate $mb=undef

[Ian Jackson <ian.jackson@eu.citrix.com>]

Allow callers to pass undef for $mb, to indicate that there is no need
for prepareguest to do anything about storage.

No functional change for any of the existing callers.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 386008f..a576b87 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1383,16 +1383,21 @@ sub prepareguest ($$$$$$) {
     }
 
     store_runvar("${gn}_hostname", $hostname);
-    store_runvar("${gn}_disk_lv", $r{"${gn}_hostname"}.'-disk');
     store_runvar("${gn}_tcpcheckport", $tcpcheckport);
     store_runvar("${gn}_boot_timeout", $boot_timeout);
 
+    if (defined $mb) {
+	store_runvar("${gn}_disk_lv", $r{"${gn}_hostname"}.'-disk');
+    }
+
     my $gho= selectguest($gn, $ho);
     store_runvar("${gn}_domname", $gho->{Name});
 
-    store_runvar("${gn}_vg", '');
-    if (!length $r{"${gn}_vg"}) {
-        store_runvar("${gn}_vg", target_choose_vg($ho, $mb));
+    if (defined $mb) {
+	store_runvar("${gn}_vg", '');
+	if (!length $r{"${gn}_vg"}) {
+	    store_runvar("${gn}_vg", target_choose_vg($ho, $mb));
+	}
     }
 
     guest_find_lv($gho);
-- 
1.7.10.4