Merge branch 'new_nested' of https://github.com/lixuemin2016/tp-qemu …

…into new_nested
autotest · May 31, 2023 · 8bf0241 · 8bf0241
2 parents 750e9ee + 341dc63
commit 8bf0241
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/qemu/deps/nested_hyperv/hyperv_sets.ps1 b/qemu/deps/nested_hyperv/hyperv_sets.ps1
@@ -11,31 +11,31 @@ param (
 function VMStop([String] $vmName){
     $vm = get-vm $vmName
     if ( $vm.State -eq "Off"){
-        write-host "Info : $vmName is stopped"
+        write-host "Info: $vmName is stopped"
         return $true
     }
 
     stop-vm $vmName -force
     if ( $? -ne $true ){
-        write-host "Error : stop-VM $vm failed"
+        write-host "Error: stop-VM $vm failed"
         return $false
     }
 
     $timeout = 100
     while ($timeout -gt 0){
         $vm = get-vm $vmName
         if ($vm.state -eq "Off"){
-            write-host "Info : $vmName state is Off now"
+            write-host "Info: $vmName state is Off now"
             break
         }
         else{
-            write-host "Info : $vmName state is not Off, waiting..."
+            write-host "Info: $vmName state is not Off, waiting..."
             start-sleep -seconds 1
             $timeout -= 1
         }
     }
     if ( $timeout -eq 0 -and $vm.state -ne "Off"){
-        write-host "Error : Stop $vm failed (timeout=$timeout)"
+        write-host "Error: Stop $vm failed (timeout=$timeout)"
         return $false
     }
 
@@ -237,7 +237,7 @@ function VMStart([String]$vmPath, [String]$vmName, [Bool]$gen2, [String]$switchN
     $hb = Get-VMIntegrationService -VMName $VMName -Name "Heartbeat"
     $vm = Get-VM $vmName
     if ($($hb.Enabled) -eq "True" -and $($vm.Heartbeat) -eq "OkApplicationsUnknown") {
-        write-host "Heartbeat detected"
+        write-host "Info: Heartbeat detected for $vmName"
         return $true
     }
     else {
@@ -416,7 +416,7 @@ switch ($action){
     }
     "clone"{   # create 2 vcpu and 1G memory
         $ret = VMStart $vhd_path $vm_name $gen2 $switchName 2 1
-        write-host $ret
+        write-host "Infor: return value of VMStart for $vm_name is $ret"
     }
     "snapshot"{
         NewCheckpoint -vmName $vm_name -snapshotName $snapshotName

diff --git a/qemu/tests/nested_hyperv_on_kvm.py b/qemu/tests/nested_hyperv_on_kvm.py
@@ -10,7 +10,7 @@
 def run(test, params, env):
     """
     Nested Hyper-V on KVM:
-    This case is used to test in L1 Windows VM, start L2 BIOS/UEFI Linux VM
+    This case is used to test in L1 Windows VM, start L2 BIOS/UEFI Linux VM via Fedora image
 
     :param test: QEMU test object
     :param params: Dictionary with the test parameters
@@ -49,7 +49,7 @@ def get_vhdx():
     get_vhdx()
 
     need_reboot = 0
-    status, output = session.cmd_status_output("powershell Get-VM -ErrorAction SilentlyContinue")
+    status, output = session.cmd_status_output("powershell Get-VM -ErrorAction SilentlyContinue", timeout=120, safe=True)
 
     if status:
         need_reboot = 1