From nobody Fri Apr 14 14:01:00 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 4PydQQ35f0z45JMt; Fri, 14 Apr 2023 14:01:02 +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 4PydQP11y6z3KGv; Fri, 14 Apr 2023 14:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480861; 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=F4vEclLTEz6VyyQ0D1+sk4RYf+q5mqYEdf7EpC2SqvA=; b=m7q48zoJSW4qszfwFmMBpidRsapmBmB4k0+xiZe2RTac6rbuN5k322fR0utGtFZu4pj4dN 3grXaSf/2PWPe6hbGQZUe5pp2xxbCFzMSL5ZvIFOiB6y2UBdMwQEmsVIv8821DSCcyUzDX M86PJmYnnP+95U400BoYT9dvmyFyx9ccFQ9/IZUNvNxto9R4i1m6IjWTstnti+pY5uWwxi UHSVdb5IOPtBn/cKmE24of8/Ba1sRh06DqSFgJpQ/HYbQbE2/J3W/k0pLs73z9uxPdFXs0 YY+4FdC/vjSsdMRYShprscweXHW66Lsb0gymy9JKE8UxX4DWviPOsWgrQTQidA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480861; 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=F4vEclLTEz6VyyQ0D1+sk4RYf+q5mqYEdf7EpC2SqvA=; b=Sxgf+T468+rh8eipGr7wv1KnaBO8pK/acC7vTFQ9o8HBvMv8YiNpG4du6nTGgB6yQc0AGF qdBIRXgvmTzCUpO0qGybXfnA4z9FqSGtf1GN2Rxe5fmsp1BT+RzXnAMMCCr91WiBSlhs7X +VefTD79M57WlA1O/TYK+eyVEJIYxn0K27nuZB5qnRsdOa5Z4rV4PO6HJ9AKxOBa0Qk4Ok 138+Y5vY/+VL+xnLBOgqdTS9mfQheWKOddPJjLBODHwZtISXGS27afweKsNjiwtmwTQ4u8 xnSFbDEQUWIIesD5zxruCULsJsw1uT4W8nSxKuELtkbB9+k2SLw57yPM5BhXzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480861; a=rsa-sha256; cv=none; b=peOT1+2yYtCtdP47TQKCJ1M4O5I9vXio3M7Ks8RZlOAaHjVzAdIvXVmMwrCugVmoi6WWcT HNWrqWAOpmI5qmy3o5DUeljefm1VyNe1BRCuKLBEf/8W4QUejx+jTSWg8AdyvULiefuFBx PbXRmdKqXqe4VIn5QDoRnx3kwfpf/2GW4vr2I2k20e7oTEIUIsZ6CdAWHUYTf69lsDXqk6 K4t3yrqFrwTRT+XDUuRa9ZcJtLMf1V/tI53iUwjSUw6NH+LmETJLDz2uGB4/uByxHktgVD 6+2o1L7pH3pas1VxzxDCDRYwYDPlzyN4pzjHlAl/bJ0Bda2dlGlr5/QUNluylg== 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 4PydQN722szRXD; Fri, 14 Apr 2023 14:01:00 +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 33EE10SN083886; Fri, 14 Apr 2023 14:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE10J1083885; Fri, 14 Apr 2023 14:01:00 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:00 GMT Message-Id: <202304141401.33EE10J1083885@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: d32d65276b20 - main - xen/intr: move evtchn_type to intr-internal.h 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: d32d65276b201d2abe963aa69cc2cfc951ddb278 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=d32d65276b201d2abe963aa69cc2cfc951ddb278 commit d32d65276b201d2abe963aa69cc2cfc951ddb278 Author: Elliott Mitchell AuthorDate: 2021-11-08 23:01:59 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:53 +0000 xen/intr: move evtchn_type to intr-internal.h The evtchn_type enum is only touched by the Xen interrupt code. Other event channel uses no longer need the value, so that has been moved to restrict its use. Copyright note. The current evtchn_type was introduced at 76acc41fb7c7 by Justin T. Gibbs. This in turn appears to have been heavily inspired by 30d1eefe3937 done by Kip Macy. Reviewed by: royger --- sys/dev/xen/bus/intr-internal.h | 9 +++++++++ sys/xen/evtchn/evtchnvar.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/xen/bus/intr-internal.h b/sys/dev/xen/bus/intr-internal.h index 222e0665b14d..18f148bcb45f 100644 --- a/sys/dev/xen/bus/intr-internal.h +++ b/sys/dev/xen/bus/intr-internal.h @@ -3,6 +3,7 @@ * * Copyright © 2002-2005 K A Fraser * Copyright © 2005 Intel Corporation + * Copyright © 2005-2006 Kip Macy * Copyright © 2013 Spectra Logic Corporation * Copyright © 2015 Julien Grall * Copyright © 2021,2022 Elliott Mitchell @@ -39,6 +40,14 @@ /* Current implementation only supports 2L event channels. */ #define NR_EVENT_CHANNELS EVTCHN_2L_NR_CHANNELS +enum evtchn_type { + EVTCHN_TYPE_UNBOUND, + EVTCHN_TYPE_VIRQ, + EVTCHN_TYPE_IPI, + EVTCHN_TYPE_PORT, + EVTCHN_TYPE_COUNT +}; + struct xenisrc { xen_arch_isrc_t xi_arch; /* @TOP -> *xi_arch=*xenisrc */ enum evtchn_type xi_type; diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h index d1438846594f..448800be18a8 100644 --- a/sys/xen/evtchn/evtchnvar.h +++ b/sys/xen/evtchn/evtchnvar.h @@ -38,14 +38,6 @@ #include #include -enum evtchn_type { - EVTCHN_TYPE_UNBOUND, - EVTCHN_TYPE_VIRQ, - EVTCHN_TYPE_IPI, - EVTCHN_TYPE_PORT, - EVTCHN_TYPE_COUNT -}; - /** Submit a port notification for delivery to a userland evtchn consumer */ void evtchn_device_upcall(evtchn_port_t port);