qemu-nvmm: more MSRs and fix build warnings

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

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Mon Oct 28 12:01:07 2019 +0100
Changeset:	acc9eabb5a67191e2cbfd947aad97ee7f7b5575a

Modified Files:
	qemu-nvmm/files/target_i386_nvmm-all.c

Log Message:
qemu-nvmm: more MSRs and fix build warnings

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

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

diffstat:
 qemu-nvmm/files/target_i386_nvmm-all.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/qemu-nvmm/files/target_i386_nvmm-all.c b/qemu-nvmm/files/target_i386_nvmm-all.c
index 983f6ee127..d70e9b5027 100644
--- a/qemu-nvmm/files/target_i386_nvmm-all.c
+++ b/qemu-nvmm/files/target_i386_nvmm-all.c
@@ -575,6 +575,7 @@ nvmm_handle_rdmsr(struct nvmm_machine *mach, CPUState *cpu,
     case MSR_MTRRcap:
     case MSR_MTRRdefType:
     case MSR_MCG_CAP:
+    case MSR_MCG_STATUS:
         val = 0;
         break;
     default: // More MSRs to add?
@@ -616,6 +617,9 @@ nvmm_handle_wrmsr(struct nvmm_machine *mach, CPUState *cpu,
     case MSR_IA32_APICBASE:
         cpu_set_apic_base(x86_cpu->apic_state, val);
         break;
+    case MSR_MTRRdefType:
+    case MSR_MCG_STATUS:
+        break;
     default: // More MSRs to add?
         error_report("NVMM: Unexpected WRMSR 0x%x [val=0x%lx], ignored",
             exit->u.wrmsr.msr, val);
@@ -1160,11 +1164,11 @@ nvmm_accel_init(MachineState *ms)
         return -err;
     }
     if (qemu_mach.cap.version != 1) {
-        error_report("NVMM: Unsupported version %lu", qemu_mach.cap.version);
+        error_report("NVMM: Unsupported version %u", qemu_mach.cap.version);
         return -EPROGMISMATCH;
     }
     if (qemu_mach.cap.state_size != sizeof(struct nvmm_x64_state)) {
-        error_report("NVMM: Wrong state size %zu", qemu_mach.cap.state_size);
+        error_report("NVMM: Wrong state size %u", qemu_mach.cap.state_size);
         return -EPROGMISMATCH;
     }