[Xen-devel] [OSSTEST PATCH 17/26] power: Rename target_reboot_force from target_reboot_hard

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

We are going to make this try softer methods first.

No functional change.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Osstest/TestSupport.pm | 4 ++--
 ts-logs-capture        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index e45f54b2..96ddbc3c 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -98,7 +98,7 @@ BEGIN {
                       sshopts authorized_keys known_hosts
                       cfg_tftp_di_version controller_ipaddr
                       remote_perl_script_open remote_perl_script_done
-                      host_reboot target_reboot target_reboot_hard            
+                      host_reboot target_reboot target_reboot_force
                       target_choose_vg target_umount_lv target_await_down
                       host_get_free_memory
 
@@ -1437,7 +1437,7 @@ sub target_reboot ($) {
     await_tcp(get_timeout($ho,'reboot',$timeout{RebootUp}), 5,$ho);
 }
 
-sub target_reboot_hard ($) {
+sub target_reboot_force ($) {
     my ($ho) = @_;
     power_cycle($ho);
     await_tcp(get_timeout($ho,'reboot',$timeout{HardRebootUp}), 5, $ho);
diff --git a/ts-logs-capture b/ts-logs-capture
index ebf40721..fe3b0813 100755
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -175,7 +175,7 @@ sub fetch_logs_host () {
     if (!try_fetch_logs($ho, $logs)) {
         logm("log fetching failed, trying hard host reboot...");
         if (!eval {
-            target_reboot_hard($ho);
+            target_reboot_force($ho);
             1;
         }) {
             logm("host reboot failed, abandoning log fetches: $@");
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel