Page MenuHomeFreeBSD
Files F169087530

D58704.diff
No OneTemporary
Actions

D58704.diff
View Options

diff --git a/sys/amd64/vmm/amd/amdvi_hw.c b/sys/amd64/vmm/amd/amdvi_hw.c
--- a/sys/amd64/vmm/amd/amdvi_hw.c
+++ b/sys/amd64/vmm/amd/amdvi_hw.c
@@ -52,7 +52,7 @@
#include "ivhd_if.h"
#include "pcib_if.h"
-#include "io/iommu.h"
+#include "../io/iommu.h"
#include "amdvi_priv.h"
SYSCTL_DECL(_hw_vmm);
diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c
--- a/sys/amd64/vmm/amd/ivrs_drv.c
+++ b/sys/amd64/vmm/amd/ivrs_drv.c
@@ -46,7 +46,7 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include "io/iommu.h"
+#include "../io/iommu.h"
#include "amdvi_priv.h"
device_t *ivhd_devs; /* IVHD or AMD-Vi device list. */
diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
--- a/sys/amd64/vmm/amd/svm.c
+++ b/sys/amd64/vmm/amd/svm.c
@@ -57,20 +57,20 @@
#include <dev/vmm/vmm_mem.h>
#include <dev/vmm/vmm_vm.h>
-#include "vmm_lapic.h"
-#include "vmm_stat.h"
-#include "vmm_ioport.h"
-#include "vatpic.h"
-#include "vlapic.h"
-#include "vlapic_priv.h"
-
-#include "x86.h"
+#include "../vmm_lapic.h"
+#include "../vmm_stat.h"
+#include "../vmm_ioport.h"
+#include "../io/vatpic.h"
+#include "../io/vlapic.h"
+#include "../io/vlapic_priv.h"
+
+#include "../x86.h"
#include "vmcb.h"
#include "svm.h"
#include "svm_softc.h"
#include "svm_msr.h"
#include "npt.h"
-#include "io/ppt.h"
+#include "../io/ppt.h"
SYSCTL_DECL(_hw_vmm);
SYSCTL_NODE(_hw_vmm, OID_AUTO, svm, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL,
diff --git a/sys/amd64/vmm/amd/svm_softc.h b/sys/amd64/vmm/amd/svm_softc.h
--- a/sys/amd64/vmm/amd/svm_softc.h
+++ b/sys/amd64/vmm/amd/svm_softc.h
@@ -29,7 +29,7 @@
#ifndef _SVM_SOFTC_H_
#define _SVM_SOFTC_H_
-#include "x86.h"
+#include "../x86.h"
#define SVM_IO_BITMAP_SIZE (3 * PAGE_SIZE)
#define SVM_MSR_BITMAP_SIZE (2 * PAGE_SIZE)
diff --git a/sys/amd64/vmm/amd/vmcb.c b/sys/amd64/vmm/amd/vmcb.c
--- a/sys/amd64/vmm/amd/vmcb.c
+++ b/sys/amd64/vmm/amd/vmcb.c
@@ -39,7 +39,7 @@
#include <dev/vmm/vmm_ktr.h>
-#include "vlapic.h"
+#include "../io/vlapic.h"
#include "vmcb.h"
#include "svm.h"
#include "svm_softc.h"
diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c
--- a/sys/amd64/vmm/intel/vmcs.c
+++ b/sys/amd64/vmm/intel/vmcs.c
@@ -40,7 +40,7 @@
#include <machine/segments.h>
#include <machine/vmm.h>
#include <machine/vmm_snapshot.h>
-#include "vmm_host.h"
+#include "../vmm_host.h"
#include "vmx_cpufunc.h"
#include "vmcs.h"
#include "ept.h"
diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -33,7 +33,7 @@
#include <vm/pmap.h>
#include "vmcs.h"
-#include "x86.h"
+#include "../x86.h"
struct pmap;
struct vmx;
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -61,21 +61,21 @@
#include <dev/vmm/vmm_mem.h>
#include <dev/vmm/vmm_vm.h>
-#include "vmm_lapic.h"
-#include "vmm_host.h"
-#include "vmm_ioport.h"
-#include "vmm_stat.h"
-#include "vatpic.h"
-#include "vlapic.h"
-#include "vlapic_priv.h"
+#include "../vmm_lapic.h"
+#include "../vmm_host.h"
+#include "../vmm_ioport.h"
+#include "../vmm_stat.h"
+#include "../io/vatpic.h"
+#include "../io/vlapic.h"
+#include "../io/vlapic_priv.h"
#include "ept.h"
#include "vmx_cpufunc.h"
#include "vmx.h"
#include "vmx_msr.h"
-#include "x86.h"
+#include "../x86.h"
#include "vmx_controls.h"
-#include "io/ppt.h"
+#include "../io/ppt.h"
#define PINBASED_CTLS_ONE_SETTING \
(PINBASED_EXTINT_EXITING | \
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -39,7 +39,7 @@
#include "vmx.h"
#include "vmx_msr.h"
-#include "x86.h"
+#include "../x86.h"
static bool
vmx_ctl_allows_one_setting(uint64_t msr_val, int bitpos)
diff --git a/sys/amd64/vmm/intel/vtd.c b/sys/amd64/vmm/intel/vtd.c
--- a/sys/amd64/vmm/intel/vtd.c
+++ b/sys/amd64/vmm/intel/vtd.c
@@ -39,7 +39,7 @@
#include <machine/vmparam.h>
#include <contrib/dev/acpica/include/acpi.h>
-#include "io/iommu.h"
+#include "../io/iommu.h"
/*
* Documented in the "Intel Virtualization Technology for Directed I/O",
diff --git a/sys/amd64/vmm/io/iommu.c b/sys/amd64/vmm/io/iommu.c
--- a/sys/amd64/vmm/io/iommu.c
+++ b/sys/amd64/vmm/io/iommu.c
@@ -38,8 +38,8 @@
#include <machine/cpu.h>
#include <machine/md_var.h>
-#include "vmm_util.h"
-#include "vmm_mem.h"
+#include "../vmm_util.h"
+#include "../vmm_mem.h"
#include "iommu.h"
SYSCTL_DECL(_hw_vmm);
diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c
--- a/sys/amd64/vmm/io/ppt.c
+++ b/sys/amd64/vmm/io/ppt.c
@@ -48,7 +48,7 @@
#include <dev/vmm/vmm_ktr.h>
-#include "vmm_lapic.h"
+#include "../vmm_lapic.h"
#include "iommu.h"
#include "ppt.h"
diff --git a/sys/amd64/vmm/io/vatpic.c b/sys/amd64/vmm/io/vatpic.c
--- a/sys/amd64/vmm/io/vatpic.c
+++ b/sys/amd64/vmm/io/vatpic.c
@@ -45,7 +45,7 @@
#include <dev/ic/i8259.h>
#include <dev/vmm/vmm_ktr.h>
-#include "vmm_lapic.h"
+#include "../vmm_lapic.h"
#include "vioapic.h"
#include "vatpic.h"
diff --git a/sys/amd64/vmm/io/vhpet.c b/sys/amd64/vmm/io/vhpet.c
--- a/sys/amd64/vmm/io/vhpet.c
+++ b/sys/amd64/vmm/io/vhpet.c
@@ -46,7 +46,7 @@
#include <dev/vmm/vmm_ktr.h>
#include <dev/vmm/vmm_vm.h>
-#include "vmm_lapic.h"
+#include "../vmm_lapic.h"
#include "vatpic.h"
#include "vioapic.h"
#include "vhpet.h"
diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c
--- a/sys/amd64/vmm/io/vioapic.c
+++ b/sys/amd64/vmm/io/vioapic.c
@@ -45,7 +45,7 @@
#include <dev/vmm/vmm_ktr.h>
#include <dev/vmm/vmm_vm.h>
-#include "vmm_lapic.h"
+#include "../vmm_lapic.h"
#include "vlapic.h"
#include "vioapic.h"
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -48,9 +48,9 @@
#include <dev/vmm/vmm_ktr.h>
#include <dev/vmm/vmm_vm.h>
+#include <dev/vmm/vmm_stat.h>
-#include "vmm_lapic.h"
-#include "vmm_stat.h"
+#include "../vmm_lapic.h"
#include "vlapic.h"
#include "vlapic_priv.h"
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -77,13 +77,13 @@
#include "vmm_host.h"
#include "vmm_mem.h"
#include "vmm_util.h"
-#include "vatpic.h"
-#include "vatpit.h"
-#include "vhpet.h"
-#include "vioapic.h"
-#include "vlapic.h"
-#include "vpmtmr.h"
-#include "vrtc.h"
+#include "io/vatpic.h"
+#include "io/vatpit.h"
+#include "io/vhpet.h"
+#include "io/vioapic.h"
+#include "io/vlapic.h"
+#include "io/vpmtmr.h"
+#include "io/vrtc.h"
#include "vmm_stat.h"
#include "vmm_lapic.h"
diff --git a/sys/amd64/vmm/vmm_ioport.c b/sys/amd64/vmm/vmm_ioport.c
--- a/sys/amd64/vmm/vmm_ioport.c
+++ b/sys/amd64/vmm/vmm_ioport.c
@@ -35,10 +35,10 @@
#include <dev/vmm/vmm_ktr.h>
#include <dev/vmm/vmm_vm.h>
-#include "vatpic.h"
-#include "vatpit.h"
-#include "vpmtmr.h"
-#include "vrtc.h"
+#include "io/vatpic.h"
+#include "io/vatpit.h"
+#include "io/vpmtmr.h"
+#include "io/vrtc.h"
#include "vmm_ioport.h"
#define MAX_IOPORTS 1280
diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c
--- a/sys/amd64/vmm/vmm_lapic.c
+++ b/sys/amd64/vmm/vmm_lapic.c
@@ -38,7 +38,7 @@
#include <machine/vmm.h>
#include "vmm_lapic.h"
-#include "vlapic.h"
+#include "io/vlapic.h"
/*
* Some MSI message definitions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -430,6 +430,67 @@
x86/x86/msi.c optional pci
x86/xen/pv.c optional xenhvm
+# vmm(8)
+amd64/vmm/vmm.c optional vmm
+amd64/vmm/vmm_dev_machdep.c optional vmm
+amd64/vmm/vmm_host.c optional vmm
+amd64/vmm/vmm_instruction_emul.c optional vmm
+amd64/vmm/vmm_ioport.c optional vmm
+amd64/vmm/vmm_lapic.c optional vmm
+amd64/vmm/vmm_mem_machdep.c optional vmm
+amd64/vmm/vmm_util.c optional vmm
+amd64/vmm/x86.c optional vmm
+amd64/vmm/vmm_snapshot.c optional bhyve_snapshot
+
+amd64/vmm/io/iommu.c optional vmm
+amd64/vmm/io/ppt.c optional vmm
+amd64/vmm/io/vatpic.c optional vmm
+amd64/vmm/io/vatpit.c optional vmm
+amd64/vmm/io/vhpet.c optional vmm
+amd64/vmm/io/vioapic.c optional vmm
+amd64/vmm/io/vlapic.c optional vmm
+amd64/vmm/io/vpmtmr.c optional vmm
+amd64/vmm/io/vrtc.c optional vmm
+
+amd64/vmm/intel/vmx_genassym.c optional vmm \
+ dependency "offset.inc" \
+ compile-with "${NOSAN_C:N-flto*:N-fno-common} -fcommon" \
+ no-obj
+vmx_assym.h optional vmm \
+ dependency "vmx_genassym.o" \
+ compile-with "sh $S/kern/genassym.sh vmx_genassym.o > ${.TARGET}" \
+ no-obj no-implicit-rule before-depend
+amd64/vmm/intel/ept.c optional vmm
+amd64/vmm/intel/vmcs.c optional vmm
+amd64/vmm/intel/vmx.c optional vmm
+amd64/vmm/intel/vmx_msr.c optional vmm
+amd64/vmm/intel/vtd.c optional vmm
+amd64/vmm/intel/vmx_support.S optional vmm \
+ dependency "vmx_assym.h"
+
+amd64/vmm/amd/svm_genassym.c optional vmm \
+ dependency "offset.inc" \
+ compile-with "${NOSAN_C:N-flto*:N-fno-common} -fcommon" \
+ no-obj
+svm_assym.h optional vmm \
+ dependency "svm_genassym.o" \
+ compile-with "sh $S/kern/genassym.sh svm_genassym.o > ${.TARGET}" \
+ no-obj no-implicit-rule before-depend
+amd64/vmm/amd/amdvi_hw.c optional vmm
+amd64/vmm/amd/amdviiommu.c optional vmm
+amd64/vmm/amd/ivhd_if.m optional vmm
+amd64/vmm/amd/ivrs_drv.c optional vmm
+amd64/vmm/amd/npt.c optional vmm
+amd64/vmm/amd/svm.c optional vmm
+amd64/vmm/amd/svm_msr.c optional vmm
+amd64/vmm/amd/vmcb.c optional vmm
+amd64/vmm/amd/svm_support.S optional vmm \
+ dependency "svm_assym.h"
+dev/vmm/vmm_dev.c optional vmm
+dev/vmm/vmm_mem.c optional vmm
+dev/vmm/vmm_stat.c optional vmm
+dev/vmm/vmm_vm.c optional vmm
+
# zfs blake3 hash support
contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx2.S optional zfs compile-with "${ZFS_S}"
contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx512.S optional zfs compile-with "${ZFS_S}"

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 9:19 AM (4 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37797038
Default Alt Text
D58704.diff (10 KB)

Event Timeline