D40554.id123308.diff
No OneTemporary
Actions

Size

840 B

Referenced Files

None

Subscribers

None

D40554.id123308.diff
View Options

	diff --git a/usr.sbin/bhyve/kernemu_dev.h b/usr.sbin/bhyve/amd64/kernemu_dev.h
	rename from usr.sbin/bhyve/kernemu_dev.h
	rename to usr.sbin/bhyve/amd64/kernemu_dev.h
	diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/amd64/kernemu_dev.c
	rename from usr.sbin/bhyve/kernemu_dev.c
	rename to usr.sbin/bhyve/amd64/kernemu_dev.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
	@@ -99,7 +99,9 @@
	#endif
	#include "gdb.h"
	#include "ioapic.h"
	-#include "kernemu_dev.h"
	+#ifdef __amd64__
	+#include "amd64/kernemu_dev.h"
	+#endif
	#include "mem.h"
	#include "mevent.h"
	#ifdef __amd64__
	@@ -1456,7 +1458,9 @@

	init_mem(guest_ncpus);
	init_inout();
	+#ifdef __amd64__
	kernemu_dev_init();
	+#endif
	init_bootrom(ctx);
	#ifdef __amd64__
	atkbdc_init(ctx);