Date: Mon, 3 Jan 2022 16:01:39 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 9fe79f2f2b22 - main - bhyve: dynamically register FwCtl ports Message-ID: <202201031601.203G1drS039406@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe79f2f2b22ea068e5acb2af23d130a13d2ab06 commit 9fe79f2f2b22ea068e5acb2af23d130a13d2ab06 Author: Corvin Köhne <CorvinK@beckhoff.com> AuthorDate: 2022-01-03 13:20:38 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2022-01-03 15:32:55 +0000 bhyve: dynamically register FwCtl ports Qemu's FwCfg uses the same ports as Bhyve's FwCtl. Static allocated ports wouldn't allow to switch between Qemu's FwCfg and Bhyve's FwCtl. Reviewed by: markj MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33496 --- usr.sbin/bhyve/fwctl.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 8faae30989e6..f0f9aa3affc0 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -540,12 +540,32 @@ fwctl_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes, return (0); } -INOUT_PORT(fwctl_wreg, FWCTL_OUT, IOPORT_F_INOUT, fwctl_handler); -INOUT_PORT(fwctl_rreg, FWCTL_IN, IOPORT_F_IN, fwctl_handler); void fwctl_init(void) { + struct inout_port iop; + int error; + + bzero(&iop, sizeof(iop)); + iop.name = "fwctl_wreg"; + iop.port = FWCTL_OUT; + iop.size = 1; + iop.flags = IOPORT_F_INOUT; + iop.handler = fwctl_handler; + + error = register_inout(&iop); + assert(error == 0); + + bzero(&iop, sizeof(iop)); + iop.name = "fwctl_rreg"; + iop.port = FWCTL_IN; + iop.size = 1; + iop.flags = IOPORT_F_IN; + iop.handler = fwctl_handler; + + error = register_inout(&iop); + assert(error == 0); ops[OP_GET_LEN] = &fgetlen_info; ops[OP_GET] = &fgetval_info;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201031601.203G1drS039406>