qemu-nvmm: improve debug messages

[Maxime Villard <max%m00nbsd.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Mon Jun 10 12:20:31 2019 +0200
Changeset:	614d805cdb7dbbedf47a5e8ce7ac6e212a281843

Modified Files:
	qemu-nvmm/distinfo
	qemu-nvmm/patches/patch-nvmm-support

Log Message:
qemu-nvmm: improve debug messages

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=614d805cdb7dbbedf47a5e8ce7ac6e212a281843

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-nvmm/distinfo                   |  2 +-
 qemu-nvmm/patches/patch-nvmm-support | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs:
diff --git a/qemu-nvmm/distinfo b/qemu-nvmm/distinfo
index b31bc4c272..09a1192216 100644
--- a/qemu-nvmm/distinfo
+++ b/qemu-nvmm/distinfo
@@ -16,7 +16,7 @@ SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_usb_dev-mtp.c) = 66543b5559d92f8e2fa9a6eb85e5dfe7c1ad3339
-SHA1 (patch-nvmm-support) = da8b940aeb49ac0f1636fa0eb880d97a655c651a
+SHA1 (patch-nvmm-support) = 7d16bd50d6ede01bac6360437e422a3a90379c69
 SHA1 (patch-target_arm_cpu.h) = 0f70a35900c7cc3124dc11969643e0eef6ad6af5
 SHA1 (patch-target_arm_helper.c) = 08f9425422080442a2c90bb252423bab38651ae4
 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162
diff --git a/qemu-nvmm/patches/patch-nvmm-support b/qemu-nvmm/patches/patch-nvmm-support
index bc02a42ed3..c0ebc985ea 100644
--- a/qemu-nvmm/patches/patch-nvmm-support
+++ b/qemu-nvmm/patches/patch-nvmm-support
@@ -376,8 +376,8 @@ Add NVMM support.
  obj-$(CONFIG_SEV) += sev.o
  obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o
 --- target/i386/nvmm-all.c	1970-01-01 01:00:00.000000000 +0100
-+++ target/i386/nvmm-all.c	2019-05-30 10:26:22.219514428 +0200
-@@ -0,0 +1,1167 @@
++++ target/i386/nvmm-all.c	2019-06-10 11:57:43.612013641 +0200
+@@ -0,0 +1,1168 @@
 +/*
 + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
 + *
@@ -963,11 +963,12 @@ Add NVMM support.
 +        break;
 +    default:
 +        // TODO: more MSRs to add?
-+        error_report("NVMM: Unexpected MSR 0x%lx, ignored",
-+            exit->u.msr.msr);
 +        if (exit->u.msr.type == NVMM_EXIT_MSR_RDMSR) {
 +            val = 0;
 +        }
++        error_report("NVMM: Unexpected %sMSR 0x%lx [val=%lx], ignored",
++            (exit->u.msr.type == NVMM_EXIT_MSR_RDMSR) ? "RD" : "WR",
++            exit->u.msr.msr, val);
 +        break;
 +    }
 +
@@ -1133,8 +1134,8 @@ Add NVMM support.
 +            ret = 1;
 +            break;
 +        default:
-+            error_report("NVMM: Unexpected VM exit code %lx",
-+                exit->reason);
++            error_report("NVMM: Unexpected VM exit code %lx [hw=%lx]",
++                exit->reason, exit->u.inv.hwcode);
 +            nvmm_get_registers(cpu);
 +            qemu_mutex_lock_iothread();
 +            qemu_system_guest_panicked(cpu_get_crash_info(cpu));