diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-02-05 00:21:19 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-02-05 00:21:21 -0500 |
| commit | 4d320273bce348b033c83d1742ce873c351c16d4 (patch) | |
| tree | 3334438c3d25e918c9b2761ece90ef6b820ea62e /usr/src/lib/libvmmapi/common/vmmapi.h | |
| parent | fc716b10604146af1eb12bfb4f10a04ab2946fd4 (diff) | |
| parent | 3c2328bf3bf6527c6b28445336d32183a277b1e1 (diff) | |
| download | illumos-joyent-4d320273bce348b033c83d1742ce873c351c16d4.tar.gz | |
[illumos-gate merge]
commit 3c2328bf3bf6527c6b28445336d32183a277b1e1
13471 zoneadmd should infer zone.max-processes
13472 Man pages missing the max-processes resource control
commit 6d177d7a4a2c4b126a6f5ecc7a226e1dcac383ed
13390 clean up libdlpi warning gags
commit f915e6d33fea11e547f382c9f44614aa99739ba5
13467 Update tzdata to 2021a
commit 602e131c272200d35797cbad3554783e0c0fdb04
13493 usba: multiply-defined symbols
commit f6ef42236c2f60c5f16c454c9b574a4dc35e1cab
13092 ZFS I/O pipeline should use the pageout_reserve pool
commit 2d9166aee5315081107056f3d663e4adee4c1c2a
13097 improve VM tunables for modern systems
13107 pageout should use hrtime instead of lbolt
commit 3770e1fa2763b08d66814eeb974a28a87198fee1
13490 4133 missed Makefile.asthdr
commit 475b46fedca96b852acd24d70191d29fb444a008
13486 cmd/ast should use fewer FRC dependencies
commit 6960cd891105f9a002a0327e31a6182f9c6de88e
13379 bhyve upstream sync 2020 Dec
Conflicts:
git add usr/src/uts/common/os/vm_pageout.c
git add usr/src/cmd/zoneadmd/vplat.c
git add usr/src/man/man5/resource_controls.5
vm_pageout.c conflict resolution by Andy Fiddaman <omnios@citrus-it.co.uk>
Diffstat (limited to 'usr/src/lib/libvmmapi/common/vmmapi.h')
| -rw-r--r-- | usr/src/lib/libvmmapi/common/vmmapi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/lib/libvmmapi/common/vmmapi.h b/usr/src/lib/libvmmapi/common/vmmapi.h index f7aaa02087..72e43a4e3d 100644 --- a/usr/src/lib/libvmmapi/common/vmmapi.h +++ b/usr/src/lib/libvmmapi/common/vmmapi.h @@ -225,6 +225,7 @@ int vm_setup_pptdev_msi(struct vmctx *ctx, int vcpu, int bus, int slot, int vm_setup_pptdev_msix(struct vmctx *ctx, int vcpu, int bus, int slot, int func, int idx, uint64_t addr, uint64_t msg, uint32_t vector_control); +int vm_disable_pptdev_msix(struct vmctx *ctx, int bus, int slot, int func); int vm_get_pptdev_limits(struct vmctx *ctx, int bus, int slot, int func, int *msi_limit, int *msix_limit); #else /* __FreeBSD__ */ @@ -236,6 +237,7 @@ int vm_setup_pptdev_msi(struct vmctx *ctx, int vcpu, int pptfd, uint64_t addr, uint64_t msg, int numvec); int vm_setup_pptdev_msix(struct vmctx *ctx, int vcpu, int pptfd, int idx, uint64_t addr, uint64_t msg, uint32_t vector_control); +int vm_disable_pptdev_msix(struct vmctx *ctx, int pptfd); int vm_get_pptdev_limits(struct vmctx *ctx, int pptfd, int *msi_limit, int *msix_limit); #endif /* __FreeBSD__ */ |