diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-04-19 16:04:24 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-04-19 16:04:27 -0400 |
| commit | 2d70679c470f43047fca8f4961628b78912d8041 (patch) | |
| tree | 0ca1cfc5cc9255466310885bdbd13554a9e66dd8 /usr/src/cmd/bhyve/inout.c | |
| parent | ced4e404c515b8735c4e6d563a547b9a8067c53c (diff) | |
| parent | 2b9481465d6ee67ac62c160dbf79c3ec3348c611 (diff) | |
| download | illumos-joyent-2d70679c470f43047fca8f4961628b78912d8041.tar.gz | |
[illumos-gate merge]
commit 2b9481465d6ee67ac62c160dbf79c3ec3348c611
13674 bhyve upstream sync 2021 March
Conflicts:
usr/src/cmd/bhyve/Makefile
usr/src/cmd/bhyve/bhyverun.c
Diffstat (limited to 'usr/src/cmd/bhyve/inout.c')
| -rw-r--r-- | usr/src/cmd/bhyve/inout.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/cmd/bhyve/inout.c b/usr/src/cmd/bhyve/inout.c index 27068023d3..0548807730 100644 --- a/usr/src/cmd/bhyve/inout.c +++ b/usr/src/cmd/bhyve/inout.c @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include <assert.h> #include "bhyverun.h" +#include "config.h" #include "inout.h" SET_DECLARE(inout_port_set, struct inout_port); @@ -116,7 +117,7 @@ register_default_iohandler(int start, int size) } int -emulate_inout(struct vmctx *ctx, int vcpu, struct vm_inout *inout, bool strict) +emulate_inout(struct vmctx *ctx, int vcpu, struct vm_inout *inout) { struct inout_handler handler; inout_func_t hfunc; @@ -134,7 +135,8 @@ emulate_inout(struct vmctx *ctx, int vcpu, struct vm_inout *inout, bool strict) hfunc = handler.handler; harg = handler.arg; - if (strict && hfunc == default_inout) + if (hfunc == default_inout && + get_config_bool_default("x86.strictio", false)) return (-1); if (in) { |