Sync with Aug 3 wip/qemu-nvmm - pkgsrc-localpatches - leot's pkgsrc LOCALPATCHES
 (HTM) hg clone https://bitbucket.org/iamleot/pkgsrc-localpatches
 (DIR) Log
 (DIR) Files
 (DIR) Refs
       ---
 (DIR) changeset e5d38dbb4650439b05738b84e6c258d256a1d81f
 (DIR) parent 3d10288bff21012d8fa2d0f3748816e2232bafb3
 (HTM) Author: Leonardo Taccari <iamleot@gmail.com>
       Date:   Fri, 16 Aug 2019 18:07:07 
       
       Sync with Aug 3 wip/qemu-nvmm
       
       Diffstat:
        emulators/qemu/patch-nvmm-support |  4 ++--
        1 files changed, 2 insertions(+), 2 deletions(-)
       ---
       diff -r 3d10288bff21 -r e5d38dbb4650 emulators/qemu/patch-nvmm-support
       --- a/emulators/qemu/patch-nvmm-support Wed Jul 17 18:31:16 2019 +0200
       +++ b/emulators/qemu/patch-nvmm-support Fri Aug 16 18:07:07 2019 +0200
       @@ -973,7 +973,7 @@
        +        if (exit->u.msr.type == NVMM_EXIT_MSR_RDMSR) {
        +            val = 0;
        +        }
       -+        error_report("NVMM: Unexpected %sMSR 0x%lx [val=%lx], ignored",
       ++        error_report("NVMM: Unexpected %sMSR 0x%lx [val=0x%lx], ignored",
        +            (exit->u.msr.type == NVMM_EXIT_MSR_RDMSR) ? "RD" : "WR",
        +            exit->u.msr.msr, val);
        +        break;
       @@ -1141,7 +1141,7 @@
        +            ret = 1;
        +            break;
        +        default:
       -+            error_report("NVMM: Unexpected VM exit code %lx [hw=%lx]",
       ++            error_report("NVMM: Unexpected VM exit code 0x%lx [hw=0x%lx]",
        +                exit->reason, exit->u.inv.hwcode);
        +            nvmm_get_registers(cpu);
        +            qemu_mutex_lock_iothread();