summaryrefslogtreecommitdiff
path: root/usr/src/cmd/bhyve/inout.c
diff options
context:
space:
mode:
authorAndy Fiddaman <omnios@citrus-it.co.uk>2021-03-26 14:06:33 +0000
committerAndy Fiddaman <omnios@citrus-it.co.uk>2021-04-19 16:13:12 +0000
commit2b9481465d6ee67ac62c160dbf79c3ec3348c611 (patch)
tree3ccf049f86906940c8af478a621835fb29844b09 /usr/src/cmd/bhyve/inout.c
parent2282d3b00bd23a5df4dfea0edd5ae737693bd4b7 (diff)
downloadillumos-joyent-2b9481465d6ee67ac62c160dbf79c3ec3348c611.tar.gz
13674 bhyve upstream sync 2021 March
Reviewed by: Patrick Mooney <pmooney@pfmooney.com> Reviewed by: Jorge Schrauwen <sjorge@blackdot.be> Reviewed by: Mike Zeller <mike.zeller@joyent.com> Reviewed by: C Fraire <cfraire@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/bhyve/inout.c')
-rw-r--r--usr/src/cmd/bhyve/inout.c6
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) {