Date: Fri, 14 Apr 2023 14:01:00 GMT From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= <royger@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d32d65276b20 - main - xen/intr: move evtchn_type to intr-internal.h Message-ID: <202304141401.33EE10J1083885@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=d32d65276b201d2abe963aa69cc2cfc951ddb278 commit d32d65276b201d2abe963aa69cc2cfc951ddb278 Author: Elliott Mitchell <ehem+freebsd@m5p.com> AuthorDate: 2021-11-08 23:01:59 +0000 Commit: Roger Pau Monné <royger@FreeBSD.org> 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 <xiaofeng.ling@intel.com> + * 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 <xen/hypervisor.h> #include <contrib/xen/event_channel.h> -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304141401.33EE10J1083885>