From 037decc890ac7c54cc2c6d363f80bfb925d19cdf Mon Sep 17 00:00:00 2001
From: Lucas Meneghel Rodrigues <lmr@redhat.com>
Date: Wed, 5 Jun 2013 13:28:20 -0300
Subject: [PATCH] cfg: Replace humanmonitor1 with hmp1

As we've been using the shorthand 'hmp1' now.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
 qemu/cfg/host-kernel.cfg             | 4 ++--
 qemu/cfg/unittests.cfg               | 4 ++--
 qemu/tests/cfg/balloon_check_qmp.cfg | 4 ++--
 qemu/tests/cfg/usb.cfg               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qemu/cfg/host-kernel.cfg b/qemu/cfg/host-kernel.cfg
index 6ebf7384..ecbef97c 100644
--- a/qemu/cfg/host-kernel.cfg
+++ b/qemu/cfg/host-kernel.cfg
@@ -22,8 +22,8 @@ variants:
             - 5:
                 host_kernel_ver_str += ".5"
                 monitor_type = human
-                monitors = humanmonitor1
-                main_monitor = humanmonitor1
+                monitors = hmp1
+                main_monitor = hmp1
                 machine_type = "rhel5.6.0"
                 cluster_size =
                 extra_params += " -usbdevice tablet"
diff --git a/qemu/cfg/unittests.cfg b/qemu/cfg/unittests.cfg
index 826253b7..5ac38651 100644
--- a/qemu/cfg/unittests.cfg
+++ b/qemu/cfg/unittests.cfg
@@ -13,8 +13,8 @@ kill_vm = yes
 kill_vm_gracefully = no
 
 # Monitor
-monitors = humanmonitor1
-main_monitor = humanmonitor1
+monitors = hmp1
+main_monitor = hmp1
 monitor_type = human
 
 # Serial console
diff --git a/qemu/tests/cfg/balloon_check_qmp.cfg b/qemu/tests/cfg/balloon_check_qmp.cfg
index 8dc8c4b1..879b6b4e 100644
--- a/qemu/tests/cfg/balloon_check_qmp.cfg
+++ b/qemu/tests/cfg/balloon_check_qmp.cfg
@@ -14,11 +14,11 @@
     test_timeout_install = 7200
     sub_test = qmp_command
     pre_command_run += "/usr/libexec/qemu-kvm --help|grep '\-qmp' || echo 'Qemu-kvm does not support qmp!';"
-    monitors = ' humanmonitor1 qmp1 qmp2'
+    monitors = ' hmp1 qmp1 qmp2'
     monitor_type_qmp1 = qmp
     monitor_type_qmp2 = qmp
     monitor_type = human
-    main_monitor = humanmonitor1
+    main_monitor = hmp1
     event_cmd_type = monitor_cmd
     qmp_cmd_run = "query-balloon"
     cmd_return_parttern_run = r"{"return": {"actual": /d+, "mem_swapped_in": /d+, "minor_page_faults":/d+, "mem_swapped_out": /d+, "free_mem": /d+, "major_page_faults":/d+, "total_mem": /d+}}"
diff --git a/qemu/tests/cfg/usb.cfg b/qemu/tests/cfg/usb.cfg
index 88645c47..5971ce05 100644
--- a/qemu/tests/cfg/usb.cfg
+++ b/qemu/tests/cfg/usb.cfg
@@ -124,8 +124,8 @@
             #XXX: Now usb_hotplug doesn't support QMP monitor.
             # Limit it to human monitor only.
             monitor_type = human
-            monitors = humanmonitor1
-            main_monitor = humanmonitor1
+            monitors = hmp1
+            main_monitor = hmp1
         - usb_storage:
             type = usb_storage
             images += " stg"
-- 
GitLab