From nobody Fri Apr 14 14:00:50 2023 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 4PydQD0sZ0z45JJw; Fri, 14 Apr 2023 14:00:52 +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 4PydQC0k2fz3JlT; Fri, 14 Apr 2023 14:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480851; 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=YTbB4M/s6mwuh92lr97BYPNE9b5zpAWy6sjIIZHySHQ=; b=WCfAG8zFiMZzVRR5CO7YzAUp5yOTq+4IBPyeWEhZeBg0DoTAG/ZVb3pj+OUoaUSTeJD6QE SnukSVC5nFXoQCCvg7tVi4TfcTX5LESn0LncsoGDsuntBHeKv87HyvamRKCbF3YMW3KZKG zkO9oHk8zppC483MHtCOCdQm5kib6272WsA6Misa4LRTGCGPD2FInBpnHPlgNq/C/pK5YF MFxc1VCgTqin2/E/+Gb251OkTpr9jQhAW12eh3Bt8/GgmCtSpRfbox/YcZ7emcDyyuEvyC TXcCeV2So735eW/YD8t31GrNTk25f09nCawvmp7LbdjN/Kg0V0WCSDGX01i5qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480851; 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=YTbB4M/s6mwuh92lr97BYPNE9b5zpAWy6sjIIZHySHQ=; b=Qd5e8iJuOkdTEjSBPMDRcyFIsxHAXf7D+HjnJVFTEXQe1Pqr0eqVlCN/aS9E0h+mRc6r++ ppUer0h05NifDKHz+zccbubVtzOx1gJuOPszuBSwYoXCvaIvm3k75XC0A0+JUMy2Ddgymx 57sJcjFE8SzJlfFWV4q0GYMbqY1c/LqRkwDwVuOJOYrhgESKD7ktgJKlV9HxrAYSIrd6eK hpNDTkuBR7EcPADndbXzA9USTOb0QhrJ56PFWdY/CnA51/L3ClAKQdFF3J4VPIh+ZDcsJw YWRoLn0Jjtzvf2cRe0txAN0rS9cymfYCPW8sPBVoaZhHU/1s+eG6+12wPsySHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480851; a=rsa-sha256; cv=none; b=rQkHXt2o3YYMa3jXKSWiVbN4kdBYGt5cn68V6RDcMqbWcLrlE+1O1HsvhojYtqO53KJUqQ VAYVS0klOCa9f4nYA4Lot+jrLDdT3lgGpE4We+Khk4uDro6TocunD3NQCLOUP1G9GhKKSV 7B4HDlkTM3ZHi/ZO0KBnM6cGOGJGX1kxV3DFzsPBcx0wqL6QglE9zFvJDhGzigKXWhzXgb Cx0U6xyqrJ1BMCNwCT070kbml50sro8qW/ni8URHNHFaUSA/7wmgs4HqtugQO7pGJJqfBr 1/2u1yH0Frt2ZrHQfRgek9fKkgVfVJrXDKYSqhFZeO0G5dPYAei6HfdvNjPQRw== 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 4PydQB6gFXzQcM; Fri, 14 Apr 2023 14:00:50 +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 33EE0oCc083650; Fri, 14 Apr 2023 14:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0omu083649; Fri, 14 Apr 2023 14:00:50 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:50 GMT Message-Id: <202304141400.33EE0omu083649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 61ccede8cf6c - main - xen: purge no longer used hypervisor functions 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ccede8cf6cc1442ce531fe28c25fd000263fb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=61ccede8cf6cc1442ce531fe28c25fd000263fb5 commit 61ccede8cf6cc1442ce531fe28c25fd000263fb5 Author: Elliott Mitchell AuthorDate: 2022-03-07 23:23:23 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:47 +0000 xen: purge no longer used hypervisor functions HYPERVISOR_poll(), HYPERVISOR_block(), and HYPERVISOR_crash() appear no longer used. Further get_system_time() appears to have disappeared at some point in the past, so HYPERVISOR_poll() was broken anyway. No functional change intended. Reviewed by: royger --- sys/xen/hypervisor.h | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/sys/xen/hypervisor.h b/sys/xen/hypervisor.h index c42956d253c2..4e79423c3a8e 100644 --- a/sys/xen/hypervisor.h +++ b/sys/xen/hypervisor.h @@ -23,8 +23,6 @@ #include #include -extern uint64_t get_system_time(int ticks); - static inline int HYPERVISOR_console_write(const char *str, int count) { @@ -43,19 +41,6 @@ HYPERVISOR_yield(void) return (rc); } -static inline int -HYPERVISOR_block( - void) -{ - int rc = HYPERVISOR_sched_op(SCHEDOP_block, NULL); - -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = HYPERVISOR_sched_op_compat(SCHEDOP_block, 0); -#endif - return (rc); -} - static inline void HYPERVISOR_shutdown(unsigned int reason) { @@ -69,33 +54,4 @@ HYPERVISOR_shutdown(unsigned int reason) #endif } -static inline void -HYPERVISOR_crash(void) -{ - HYPERVISOR_shutdown(SHUTDOWN_crash); - /* NEVER REACHED */ - for (;;) ; /* eliminate noreturn error */ -} - -/* Transfer control to hypervisor until an event is detected on one */ -/* of the specified ports or the specified number of ticks elapse */ -static inline int -HYPERVISOR_poll( - evtchn_port_t *ports, unsigned int nr_ports, int ticks) -{ - int rc; - struct sched_poll sched_poll = { - .nr_ports = nr_ports, - .timeout = get_system_time(ticks) - }; - set_xen_guest_handle(sched_poll.ports, ports); - - rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll); -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = HYPERVISOR_sched_op_compat(SCHEDOP_yield, 0); -#endif - return (rc); -} - #endif /* __XEN_HYPERVISOR_H__ */