From nobody Mon Jan 17 16:22:17 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1E07F196D8A0; Mon, 17 Jan 2022 16:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jcxy14W6Mz3DSj; Mon, 17 Jan 2022 16:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642436538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Laqf/fZF/Qk0n1GHq6Rpc+J1t4MQCwklejSRZ6X+C8=; b=sc2HOEdMvUAjpaQpFcA5rBIREgEUZbXEHUIBOLj6LXuaaNa16N3pb5UTda/jZitkggvwkE WSN79qyti4qiqwWQnEwfVkN+q8uh6w5C85HIYu6SXR6kMZd12yASKs8AY/5rrsu6jebZP7 JJUAC1oRjajJ0QEB39Hk1Eqjx3KUH8se2Op+4Pshai3yBYFrdJ2AsfNMM69EiM91IdEYHd 0zeqOPCGDhe5JVh1eQdLV5v48Gtu/VABRYFMKQqaMeHoYgPWGXrJGEAzO4brcn8mJ80+KI nnV03UPwAYSoApUtloZXERjn2ToI3k9F8mkCzHLfPcx73pL87XRlJ5T9cbfYvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7856E1121C; Mon, 17 Jan 2022 16:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20HGMHB6019173; Mon, 17 Jan 2022 16:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HGMHvi019172; Mon, 17 Jan 2022 16:22:17 GMT (envelope-from git) Date: Mon, 17 Jan 2022 16:22:17 GMT Message-Id: <202201171622.20HGMHvi019172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: ff1e10c8f626 - stable/13 - bhyve: dynamically register FwCtl ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ff1e10c8f6268840a990bd9bbfb3722b300d49fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642436538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Laqf/fZF/Qk0n1GHq6Rpc+J1t4MQCwklejSRZ6X+C8=; b=oYHOKSSgJHgZQVw0BuErwcswN/x5Zym3JxgjAfkE1KDgJ9v7JYG2q2s852uaiUZVLiw+lg /4wQA9wiLE7HmY/KrWIeJlDRS0mAfjQxfQS/Ukchz9sunZUM1uHZJUdxI2jzEcHyLkpuJm K2YZadZ6nrGhyDaaszHpkeofDV4qbSIIGZOhafIiZMpBc307p6k9J7uupJfXfnw/WntHoq lbQMXUv6dUu7C/gn8KWNLDvCh+DOGl1rvbJ/5Q05kU3Cj1+5HbMMQfbF7mombg7t/GlUDT EKNwi+iray5taJ3sG251OZ4Gmy8VQD8TCBEkqqwc7BivDJVrBwNmo3hdNieEdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642436538; a=rsa-sha256; cv=none; b=xT3BbYeTO+1EEu2NjlS+b9B4mTxFde6gR4yxVbKjbTaA+ssh36BWhvQx1jHC8cHg8O3VO9 9Lfs9IoUQlUUaHEU44piPPQSximxxBNZ/RJwFGEr9MksZ9qBS8XjIkB2QZMVYDHB1s9dvy aSGIjqXIadumDUOwbjlhgfo/anGf9dad0X4YF95EObKcPc5ExLJcPLOUmFhpUJpBTUcSgA O9G0wq6A+B9CTF+r2oKFIOLpMbA0Gd6T64/B2j+aPEdK4UDd2Yw3c4cotkgubC7CYTjMoS kWvFUVO22HF7CEI/eL9UzNv/KL2HOkSEA3aVTFups1i+km2xUoTmqvbnmYnfiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ff1e10c8f6268840a990bd9bbfb3722b300d49fd commit ff1e10c8f6268840a990bd9bbfb3722b300d49fd Author: Corvin Köhne AuthorDate: 2022-01-03 13:20:38 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-17 12:53:28 +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 (cherry picked from commit 9fe79f2f2b22ea068e5acb2af23d130a13d2ab06) --- 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 abb234fe1de4..7c27d7e92532 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;