Page MenuHomeFreeBSD
Files F96499647

D40551.diff
No OneTemporary
Actions

D40551.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
@@ -17,7 +17,6 @@
SRCS= \
acpi.c \
acpi_device.c \
- atkbdc.c \
audio.c \
basl.c \
bhyvegc.c \
@@ -63,9 +62,6 @@
pci_xhci.c \
pctestdev.c \
pm.c \
- post.c \
- ps2kbd.c \
- ps2mouse.c \
qemu_fwcfg.c \
qemu_loader.c \
rfb.c \
@@ -138,6 +134,4 @@
NO_WCAST_ALIGN=
-SUBDIR= kbdlayout
-
.include <bsd.prog.mk>
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
@@ -1,6 +1,13 @@
SRCS+= \
+ atkbdc.c \
fwctl.c \
+ post.c \
+ ps2kbd.c \
+ ps2mouse.c \
task_switch.c
+
.PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm
SRCS+= vmm_instruction_emul.c
+
+SUBDIR+= kbdlayout
diff --git a/usr.sbin/bhyve/atkbdc.h b/usr.sbin/bhyve/amd64/atkbdc.h
rename from usr.sbin/bhyve/atkbdc.h
rename to usr.sbin/bhyve/amd64/atkbdc.h
diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/amd64/atkbdc.c
rename from usr.sbin/bhyve/atkbdc.c
rename to usr.sbin/bhyve/amd64/atkbdc.c
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/amd64/post.c
rename from usr.sbin/bhyve/post.c
rename to usr.sbin/bhyve/amd64/post.c
diff --git a/usr.sbin/bhyve/ps2kbd.h b/usr.sbin/bhyve/amd64/ps2kbd.h
rename from usr.sbin/bhyve/ps2kbd.h
rename to usr.sbin/bhyve/amd64/ps2kbd.h
diff --git a/usr.sbin/bhyve/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c
rename from usr.sbin/bhyve/ps2kbd.c
rename to usr.sbin/bhyve/amd64/ps2kbd.c
diff --git a/usr.sbin/bhyve/ps2mouse.h b/usr.sbin/bhyve/amd64/ps2mouse.h
rename from usr.sbin/bhyve/ps2mouse.h
rename to usr.sbin/bhyve/amd64/ps2mouse.h
diff --git a/usr.sbin/bhyve/ps2mouse.c b/usr.sbin/bhyve/amd64/ps2mouse.c
rename from usr.sbin/bhyve/ps2mouse.c
rename to usr.sbin/bhyve/amd64/ps2mouse.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
@@ -82,7 +82,9 @@
#include "bhyverun.h"
#include "acpi.h"
-#include "atkbdc.h"
+#ifdef __amd64__
+#include "amd64/atkbdc.h"
+#endif
#include "bootrom.h"
#include "config.h"
#include "inout.h"
@@ -1454,7 +1456,9 @@
init_inout();
kernemu_dev_init();
init_bootrom(ctx);
+#ifdef __amd64__
atkbdc_init(ctx);
+#endif
pci_irq_init(ctx);
ioapic_init(ctx);
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -75,7 +75,9 @@
#include "bhyverun.h"
#include "acpi.h"
-#include "atkbdc.h"
+#ifdef __amd64__
+#include "amd64/atkbdc.h"
+#endif
#include "debug.h"
#include "inout.h"
#include "ipc.h"
@@ -892,7 +894,12 @@
return (ret);
}
- return (vm_restore_device(rstate, atkbdc_snapshot, "atkbdc", NULL));
+#ifdef __amd64__
+ ret = vm_restore_device(rstate, atkbdc_snapshot, "atkbdc", NULL);
+#else
+ ret = 0;
+#endif
+ return (ret);
}
int
@@ -1131,8 +1138,12 @@
goto snapshot_err;
}
+#ifdef __amd64__
ret = vm_snapshot_device(atkbdc_snapshot, "atkbdc", NULL,
data_fd, xop, meta, &offset);
+#else
+ ret = 0;
+#endif
xo_close_list_h(xop, JSON_DEV_ARR_KEY);

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 26, 6:26 AM (21 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12763471
Default Alt Text
D40551.diff (3 KB)

Event Timeline