[Xen-devel] [OSSTEST PATCH 22/26] TestSupport: guest_prepare_disk: cope with no disk

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

If the guest has no runvars specifying any kind of disk, do not
attempt to mess about with unmounting it etc.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Osstest/TestSupport.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index a6ab18f..7eb7bc4 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1580,7 +1580,7 @@ sub guest_prepare_disk ($) {
 
     guest_umount_lv($gho->{Host}, $gho);
 
-    return if $gho->{Diskfmt} eq "none";
+    return if ($gho->{Diskfmt} // 'none') eq "none";
 
     target_cmd_root($gho->{Host}, <<END);
 mkdir -p $gho->{Diskmnt}
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel