Merge pull request #248 from Bauer312/update-fbsd

Resolve implicit conversion error on latest MacOS Mojave with latest Xcode

Author: justincormack

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 */

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;