D40735.id123699.diff
No OneTemporary
Actions

Size

972 B

Referenced Files

None

Subscribers

None

D40735.id123699.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
	@@ -58,7 +58,6 @@
	pci_virtio_scsi.c \
	pci_xhci.c \
	pctestdev.c \
	- pm.c \
	qemu_fwcfg.c \
	qemu_loader.c \
	rfb.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,6 +7,7 @@
	kernemu_dev.c \
	mptbl.c \
	post.c \
	+ pm.c \
	ps2kbd.c \
	ps2mouse.c \
	rtc.c \
	diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/amd64/pm.c
	rename from usr.sbin/bhyve/pm.c
	rename to usr.sbin/bhyve/amd64/pm.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
	@@ -1042,8 +1042,8 @@

	#ifdef __amd64__
	rtc_init(ctx);
	-#endif
	sci_init(ctx);
	+#endif

	if (qemu_fwcfg_init(ctx) != 0) {
	fprintf(stderr, "qemu fwcfg initialization error");