diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-04-22 10:20:35 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-04-22 10:20:35 -0400 |
| commit | 5244deb7f469804611650997643f9f52896fafeb (patch) | |
| tree | 91e986ce17b3ed50643bc8dd4b395734b32bcc6b /usr/src/cmd/bhyve | |
| parent | edca041beee90a450071fd47356c26905e1b9937 (diff) | |
| parent | 7c8c0b8227679b4684566e408ccc96d6ef7175e9 (diff) | |
| download | illumos-joyent-5244deb7f469804611650997643f9f52896fafeb.tar.gz | |
[illumos-gate merge]
commit 7c8c0b8227679b4684566e408ccc96d6ef7175e9
14587 bhyve and viona belong in uts/intel
Conflicts:
usr/src/cmd/bhyve/Makefile
usr/src/lib/brand/bhyve/zone/Makefile
Diffstat (limited to 'usr/src/cmd/bhyve')
| -rw-r--r-- | usr/src/cmd/bhyve/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/pci_passthru.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index fcf93c5647..e006bc3434 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -125,10 +125,9 @@ CPPFLAGS = -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \ -I$(SRC)/lib/lib9p/common \ -I$(SRC)/uts/common/io/e1000api \ $(CPPFLAGS.master) \ - -I$(ROOT)/usr/platform/i86pc/include \ - -I$(SRC)/uts/i86pc/io/vmm \ + -I$(SRC)/uts/intel/io/vmm \ -I$(SRC)/uts/common \ - -I$(SRC)/uts/i86pc \ + -I$(SRC)/uts/intel \ -I$(SRC)/lib/libdladm/common \ -DWITHOUT_CAPSICUM @@ -196,6 +195,6 @@ include ../Makefile.targ $(ZHYVE_DIR)/%: % $(INS.file) -%.o: $(SRC)/uts/i86pc/io/vmm/%.c +%.o: $(SRC)/uts/intel/io/vmm/%.c $(COMPILE.c) $< $(POST_PROCESS_O) diff --git a/usr/src/cmd/bhyve/pci_passthru.c b/usr/src/cmd/bhyve/pci_passthru.c index aea278c0c8..0c512188b0 100644 --- a/usr/src/cmd/bhyve/pci_passthru.c +++ b/usr/src/cmd/bhyve/pci_passthru.c @@ -512,7 +512,7 @@ init_msix_table(struct vmctx *ctx, struct passthru_softc *sc) /* * Mapping pptfd provides access to the BAR containing the MSI-X - * table. See ppt_devmap() in usr/src/uts/i86pc/io/vmm/io/ppt.c + * table. See ppt_devmap() in usr/src/uts/intel/io/vmm/io/ppt.c * * This maps the whole BAR and then mprotect(PROT_NONE) is used below * to prevent access to pages that don't contain the MSI-X table. |