D40733.1792006455.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40733.1792006455.diff
View Options

	diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
	--- a/usr.sbin/bhyve/Makefile
	+++ b/usr.sbin/bhyve/Makefile
	@@ -76,8 +76,7 @@
	vga.c \
	virtio.c \
	vmexit.c \
	- vmgenc.c \
	- xmsr.c
	+ vmgenc.c

	.if ${MK_BHYVE_SNAPSHOT} != "no"
	SRCS+= snapshot.c
	diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc
	--- a/usr.sbin/bhyve/amd64/Makefile.inc
	+++ b/usr.sbin/bhyve/amd64/Makefile.inc
	@@ -7,7 +7,8 @@
	post.c \
	ps2kbd.c \
	ps2mouse.c \
	- task_switch.c
	+ task_switch.c \
	+ xmsr.c

	.PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm
	SRCS+= vmm_instruction_emul.c
	diff --git a/usr.sbin/bhyve/xmsr.h b/usr.sbin/bhyve/amd64/xmsr.h
	rename from usr.sbin/bhyve/xmsr.h
	rename to usr.sbin/bhyve/amd64/xmsr.h
	diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c
	rename from usr.sbin/bhyve/xmsr.c
	rename to usr.sbin/bhyve/amd64/xmsr.c
	diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
	--- a/usr.sbin/bhyve/bhyverun.c
	+++ b/usr.sbin/bhyve/bhyverun.c
	@@ -106,7 +106,9 @@
	#include "rtc.h"
	#include "vmgenc.h"
	#include "vmexit.h"
	-#include "xmsr.h"
	+#ifdef __amd64__
	+#include "amd64/xmsr.h"
	+#endif

	#define MB (1024UL * 1024)
	#define GB (1024UL * MB)
	@@ -1015,11 +1017,13 @@
	exit(4);
	}

	+#ifdef __amd64__
	error = init_msr();
	if (error) {
	fprintf(stderr, "init_msr error %d", error);
	exit(4);
	}
	+#endif

	init_mem(guest_ncpus);
	init_inout();