[libvirt] [PATCH 9/9] qemu: fix order of S390 panic event information

Bjoern Walk bwalk at linux.ibm.com
Wed Jul 11 10:49:22 UTC 2018


Let's make the formatting of the log output consistent to the domstate
output and put the reason first.

Signed-off-by: Bjoern Walk <bwalk at linux.ibm.com>
---
 src/qemu/qemu_monitor.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 1ca54283..47af8a8d 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4286,12 +4286,12 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfoPtr info)
                                  info->data.hyperv.arg5));
         break;
     case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390:
-        ignore_value(virAsprintf(&ret, "s390: core='%d' psw-mask='0x%016llx' "
-                                 "psw-addr='0x%016llx' reason='%s'",
+        ignore_value(virAsprintf(&ret, "s390: reason='%s' core='%d' psw-mask='0x%016llx' "
+                                 "psw-addr='0x%016llx'",
+                                 info->data.s390.reason,
                                  info->data.s390.core,
                                  info->data.s390.psw_mask,
-                                 info->data.s390.psw_addr,
-                                 info->data.s390.reason));
+                                 info->data.s390.psw_addr));
         break;
     case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE:
     case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST:
-- 
2.17.0




More information about the libvir-list mailing list