From nobody Thu Jun 15 16:39:43 2023 X-Original-To: dev-commits-src-main@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 4Qhp0v5N8Gz4fRn2; Thu, 15 Jun 2023 16:39:43 +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 4Qhp0v4F1Mz4GBF; Thu, 15 Jun 2023 16:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686847183; 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=bvtGz5+XwICv7tx455ajUHyi/OBHnWIK3PJ9HD8Wu7Q=; b=aejMGGBkx2yHvvx8z1FN/jOwgOzXV7W952Fg8n33UiVObyIt1b8YKcVTcwOhIqZ4U5U9HV /07yW/1xBW/KWOw2T4Z6QH3Eit4lpLJrNPVx1Kd/VQix8qerBg0OccXBRnR2RfxRgki4bT j9lu5k2JJ4raTbAwvGQ9H9X86efwyAccUwyh48HnjscfU7GcudA3Ful9s3e9uGY+ZnwMkj XQ+C8SBDXWlLtN3MGYbriHTVZNlbrtYec1ABSh+2NHZVt2JpMWvRy0OSAIi2uUvGoRergf 9SJhO8exzml5YISLxWc/Ui+9Bnjmic4D1WfOgoUX27GKGAxDuTs5dWWsWiETFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686847183; 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=bvtGz5+XwICv7tx455ajUHyi/OBHnWIK3PJ9HD8Wu7Q=; b=LOvJCw42XfC2km3ZIE6FN2D+glYwjU3PyvrdV2WbrUmMGQ833ZPH6Q5Hu7paRo9COQtTCF +xlpoy76cRkc2iLghTiz2ZBJW+M0njlCDXejsVogg8QouLHenizztX0JcIHwsKZdVKgNhB BiA75i5KefUNRZvCSXTe8OvHIauohAy2WfBuQjeJqlc/2kDQmhpgUVNs+YbVhGdNUYd8Nt nA/FD0/c1O9AZ2g7JWxcHE55Fq1dj/Hbod8Vfgh+Igofe/TYUjR6SSVvqt+C8uYbLvMEb3 tfl/CWmjxTJxx9ZvO12vi/766mWRAwldXBKBEbcVJdnq14YZ5QXmxdddA5CgiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686847183; a=rsa-sha256; cv=none; b=LmF1kGR/sOo8CGRiCU93ojOj1u7OP6oINLCcMJCGfeXdlpgNs7yLrVU9aP7qnx0ZRIn4Tl 33AZk7nE84UoK1Z4Tar/Z69K2mkduubByA364cbSmNR/f4kIZyhpcP+GyQ/Clb9xg2lQ91 qFrtSQKO4NEwY9r+4dyBO/qEJwHAf1B+TNxvkcprtqu573fR/ELDP3N321fOi+xU6FKNjq CwefudSvY3QidPwzCp4sJeHeDdBXfq60jH8cshwRh2dYDSZ3rZPYmbvlXEdWvdOfc503hM daRd/4+dh9wFgJywQ4/b+SMJ5sqx341SfH+hbmJJ8OcurxL5F0WjuiQBY0DyMg== 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 4Qhp0v3KBrztZy; Thu, 15 Jun 2023 16:39:43 +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 35FGdhhg085949; Thu, 15 Jun 2023 16:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35FGdhT8085948; Thu, 15 Jun 2023 16:39:43 GMT (envelope-from git) Date: Thu, 15 Jun 2023 16:39:43 GMT Message-Id: <202306151639.35FGdhT8085948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e1390215af4e - main - bhyve: Remove special no-op handling for I/O port 0x488 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1390215af4ed975b43ccc41b75c30bdc0995d06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e1390215af4ed975b43ccc41b75c30bdc0995d06 commit e1390215af4ed975b43ccc41b75c30bdc0995d06 Author: Mark Johnston AuthorDate: 2023-06-15 16:12:25 +0000 Commit: Mark Johnston CommitDate: 2023-06-15 16:39:27 +0000 bhyve: Remove special no-op handling for I/O port 0x488 This appears to have been reserved for some kind of debug hook, but it's not implemented and appears never to have been used. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40555 --- usr.sbin/bhyve/bhyverun.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index d56a1575e65d..052657a50dbf 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -112,8 +112,6 @@ __FBSDID("$FreeBSD$"); #include "rtc.h" #include "vmgenc.h" -#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */ - #define MB (1024UL * 1024) #define GB (1024UL * MB) @@ -564,36 +562,17 @@ fbsdrun_deletecpu(int vcpu) return (CPU_EMPTY(&cpumask)); } -static int -vmexit_handle_notify(struct vmctx *ctx __unused, struct vcpu *vcpu __unused, - struct vm_exit *vme __unused, uint32_t eax __unused) -{ -#if BHYVE_DEBUG - /* - * put guest-driven debug here - */ -#endif - return (VMEXIT_CONTINUE); -} - static int vmexit_inout(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) { struct vm_exit *vme; int error; - int bytes, port, in, out; + int bytes, port, in; vme = vmrun->vm_exit; port = vme->u.inout.port; bytes = vme->u.inout.bytes; in = vme->u.inout.in; - out = !in; - - /* Extra-special case of host notifications */ - if (out && port == GUEST_NIO_PORT) { - error = vmexit_handle_notify(ctx, vcpu, vme, vme->u.inout.eax); - return (error); - } error = emulate_inout(ctx, vcpu, vme); if (error) {