From 0e5c4ece49479e8c983cd0f50023b42bc2243ebb Mon Sep 17 00:00:00 2001 From: Brian Bauer Date: Thu, 4 Apr 2019 21:02:36 -0500 Subject: [PATCH] Update from XHYVE source commit 9ea6650 by user jeremyhu NOTE CI error: Error: opam: cxx11 is not a recognized standard Signed-off-by: Brian Bauer --- src/include/xhyve/firmware/fbsd.h | 2 +- src/lib/firmware/fbsd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/xhyve/firmware/fbsd.h b/src/include/xhyve/firmware/fbsd.h index 968ba42a..63c0c3ca 100644 --- a/src/include/xhyve/firmware/fbsd.h +++ b/src/include/xhyve/firmware/fbsd.h @@ -66,7 +66,7 @@ struct loader_callbacks { /* Set a guest register value */ void (*setreg)(void *arg, int, uint64_t); /* Set a guest MSR value */ - void (*setmsr)(void *arg, int, uint64_t); + void (*setmsr)(void *arg, u_int, uint64_t); /* Set a guest CR value */ void (*setcr)(void *arg, int, uint64_t); /* Set the guest GDT address */ diff --git a/src/lib/firmware/fbsd.c b/src/lib/firmware/fbsd.c index 3da4029e..cdd6e22b 100644 --- a/src/lib/firmware/fbsd.c +++ b/src/lib/firmware/fbsd.c @@ -679,7 +679,7 @@ cb_setreg(UNUSED void *arg, int r, uint64_t v) } static void -cb_setmsr(UNUSED void *arg, int r, uint64_t v) +cb_setmsr(UNUSED void *arg, u_int r, uint64_t v) { int error; enum vm_reg_name vmreg;