From nobody Mon Feb 07 09:16:39 2022 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 22BB219AAB12; Mon, 7 Feb 2022 09:16:40 +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 4JsgWC4Kgtz3L1K; Mon, 7 Feb 2022 09:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644225399; 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=rQIMpRiX68JDdcgV0BT+fgwP5uPdbhAn7778Qm9CCfg=; b=nOe4ByncJAVQ3+hsHO+vlpy2AuF+tQ6oM4wQK3vxDhBNVNcL+GzDINeXKSsQ7SOmfwsmRc FibFVZ+Owbr62EmIZuAb2f222LblSsjpzwowgH/aG5aX/8n9mHl6iJkmvxoOuddheQ2iTN FIcpe9ZSKNqTeBrxsXhWuIMAluRSh222Wn4WQ/ZPeViwwa3ff5dvVFEoWCbJr95Yl4jwNR sqz4lT/lknmtfOjXkf5zYEqSWKndlI1A7vz5c2zs6Oyt1+NtOH/0s8/lCraI0E9tNy25Ml EthC8UyTkv576r0fE50agU+YeVXmcPMBYvlZSWCvYoA+uZMkn+U3m/nByxw+wg== 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 3B6F822D47; Mon, 7 Feb 2022 09:16:39 +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 2179GdbZ010014; Mon, 7 Feb 2022 09:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179Gdag010013; Mon, 7 Feb 2022 09:16:39 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:16:39 GMT Message-Id: <202202070916.2179Gdag010013@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 Pau Monn=C3=A9?= Subject: git: ad7dd5149910 - main - xen: switch to use headers in contrib 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad7dd5149910a7bc5ff5353a54393e64e3e74690 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644225399; 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=rQIMpRiX68JDdcgV0BT+fgwP5uPdbhAn7778Qm9CCfg=; b=vPBE5ejXAyH3bEQBYY/0k2bhGVwrdbEZ/tFojOFSVMpZTu/aPgo1Urcr246j9tHcFKIZej 6/S6KK9N3fXSO5m+t7+G6GJ71+hPRyqsa0L4o2/8IMi0OPS8IQucYanjpmMzOYsItXj2n3 RRYBYPoYB+NAJ2JLr+bb2uLA7rKfWmqg0XiowVlW86Rn5BfATW59knFIYgsTzfIQsP2904 CHROK79u2hawBzgZp8OKP6meNIKuDJw4TPx3BaHMvG1t+4j171bS53P6yrK0UAevLZs0pc pOwce+TbloQH6gRqrZ3RZPGuSyoTKAt4326hAKX/29pxDl/V+dE+3XFqYNhxSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644225399; a=rsa-sha256; cv=none; b=Hr0yra19D7hPvuwzVKrR75gJw206PhAjhTXeIlU/sxXoiaqgyOPwsUtMOS6BE7qio4lgQw GbrQ53QOldxex+4j1wUrdxOFXdwu+6KACFfPAXbjCTlBA+fpalyljTvJ7ayqWJCoaz3Hzi JGjibPWxBzpht/y4HpXEgi2YiWCRDVOdO4pILCtVilyG1GmZSjWV+HhrCQS+p4QoHeXpWr o2hqmf2HejsaMUmcbG3Ebpp0WSYqEsuCQbundyin5FLEGt90NaRVkEMoJDgMecdVUwI6iT 5X/u+uF2FZNzmlK68SW25B1kZfwJdc7e6JZhJA0RDt7iwjEPGp+Eq3hdSABZ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=ad7dd5149910a7bc5ff5353a54393e64e3e74690 commit ad7dd5149910a7bc5ff5353a54393e64e3e74690 Author: Elliott Mitchell AuthorDate: 2021-10-13 02:00:26 +0000 Commit: Roger Pau Monné CommitDate: 2022-02-07 09:11:56 +0000 xen: switch to use headers in contrib These headers originate with the Xen project and shouldn't be mixed with the main portion of the FreeBSD kernel. Notably they shouldn't be the target of clean-up commits. Switch to use the headers in sys/contrib/xen. Reviewed by: royger --- sys/amd64/amd64/xen-locore.S | 2 +- sys/dev/xen/blkback/blkback.c | 6 +++--- sys/dev/xen/blkfront/blkfront.c | 4 ++-- sys/dev/xen/console/xen_console.c | 2 +- sys/dev/xen/control/control.c | 4 ++-- sys/dev/xen/efi/pvefi.c | 2 +- sys/dev/xen/netback/netback.c | 2 +- sys/dev/xen/netfront/netfront.c | 4 ++-- sys/dev/xen/timer/timer.c | 4 ++-- sys/dev/xen/xenstore/xenstore.c | 2 +- sys/i386/include/xen/hypercall.h | 4 ++-- sys/x86/xen/hvm.c | 6 +++--- sys/x86/xen/pv.c | 4 ++-- sys/x86/xen/xen_apic.c | 4 ++-- sys/xen/blkif.h | 6 +++--- sys/xen/error.h | 2 +- sys/xen/evtchn/evtchnvar.h | 2 +- sys/xen/features.h | 2 +- sys/xen/gnttab.h | 2 +- sys/xen/hvm.h | 4 ++-- sys/xen/hypervisor.h | 16 ++++++++-------- sys/xen/xen-os.h | 4 ++-- sys/xen/xen_intr.h | 2 +- sys/xen/xenbus/xenbusvar.h | 6 +++--- sys/xen/xenstore/xenstorevar.h | 6 +++--- 25 files changed, 51 insertions(+), 51 deletions(-) diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S index c112fa909adf..7dc5d1d93842 100644 --- a/sys/amd64/amd64/xen-locore.S +++ b/sys/amd64/amd64/xen-locore.S @@ -38,7 +38,7 @@ #include #define __ASSEMBLY__ -#include +#include #include "assym.inc" diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index 4470cc59a29a..792933402c93 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include @@ -1280,7 +1280,7 @@ bailout_error: * \param xbb Per-instance xbb configuration structure. * \param req The request structure to which to respond. * \param status The status code to report. See BLKIF_RSP_* - * in sys/xen/interface/io/blkif.h. + * in sys/contrib/xen/io/blkif.h. */ static void xbb_queue_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status) diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c index 72498620764b..3219c26222aa 100644 --- a/sys/dev/xen/blkfront/blkfront.c +++ b/sys/dev/xen/blkfront/blkfront.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include +#include +#include #include #include diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c index c26b741c37fe..27da02723dc3 100644 --- a/sys/dev/xen/console/xen_console.c +++ b/sys/dev/xen/console/xen_console.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include "opt_ddb.h" #include "opt_printf.h" diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index b42b52a62411..903864d84598 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -148,8 +148,8 @@ __FBSDID("$FreeBSD$"); #include -#include -#include +#include +#include #include diff --git a/sys/dev/xen/efi/pvefi.c b/sys/dev/xen/efi/pvefi.c index 65778b7bcee1..77557692cbf1 100644 --- a/sys/dev/xen/efi/pvefi.c +++ b/sys/dev/xen/efi/pvefi.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include extern char bootmethod[16]; diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index 8de4e11c61d9..bf54f3a2f28e 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include /*--------------------------- Compile-time Tunables --------------------------*/ diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index 8dba5a8dc6d5..facab6550ca3 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include +#include +#include #include #include "xenbus_if.h" diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c index ecd4e0990652..fb646d8f0536 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/timer.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include +#include +#include #include #include diff --git a/sys/dev/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c index d09fd22f4eb1..534cb65ca152 100644 --- a/sys/dev/xen/xenstore/xenstore.c +++ b/sys/dev/xen/xenstore/xenstore.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include diff --git a/sys/i386/include/xen/hypercall.h b/sys/i386/include/xen/hypercall.h index 78052fac9355..4002aac58d84 100644 --- a/sys/i386/include/xen/hypercall.h +++ b/sys/i386/include/xen/hypercall.h @@ -31,8 +31,8 @@ #define __HYPERCALL_H__ #include -#include -#include +#include +#include extern char *hypercall_page; diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 6eb16c3098fd..544b6e6439e8 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -58,9 +58,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include +#include +#include +#include /*--------------------------- Forward Declarations ---------------------------*/ static void xen_hvm_cpu_init(void); diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index e0c88992390e..c5d7629d0bc5 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index 77268d5f9846..3b7c220126fa 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include /*--------------------------- Forward Declarations ---------------------------*/ static driver_filter_t xen_smp_rendezvous_action; diff --git a/sys/xen/blkif.h b/sys/xen/blkif.h index 721bb93c3c48..abc321795516 100644 --- a/sys/xen/blkif.h +++ b/sys/xen/blkif.h @@ -23,9 +23,9 @@ #ifndef __XEN_BLKIF_H__ #define __XEN_BLKIF_H__ -#include -#include -#include +#include +#include +#include /* Not a real protocol. Used to generate ring structs which contain * the elements common to all protocols only. This way we get a diff --git a/sys/xen/error.h b/sys/xen/error.h index 6f25b0ab491a..245281604aca 100644 --- a/sys/xen/error.h +++ b/sys/xen/error.h @@ -29,7 +29,7 @@ #ifndef __XEN_ERROR_H__ #define __XEN_ERROR_H__ -#include +#include /* Translation table */ static int xen_errors[] = diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h index c7c38df34a00..1f78755115ac 100644 --- a/sys/xen/evtchn/evtchnvar.h +++ b/sys/xen/evtchn/evtchnvar.h @@ -35,7 +35,7 @@ #define __XEN_EVTCHN_EVTCHNVAR_H__ #include -#include +#include enum evtchn_type { EVTCHN_TYPE_UNBOUND, diff --git a/sys/xen/features.h b/sys/xen/features.h index b4cce2fd4b1b..fa3c323d9b34 100644 --- a/sys/xen/features.h +++ b/sys/xen/features.h @@ -9,7 +9,7 @@ #ifndef __ASM_XEN_FEATURES_H__ #define __ASM_XEN_FEATURES_H__ -#include +#include extern void setup_xen_features(void); diff --git a/sys/xen/gnttab.h b/sys/xen/gnttab.h index 7d1f71fbee0d..d85f882c0c4b 100644 --- a/sys/xen/gnttab.h +++ b/sys/xen/gnttab.h @@ -41,7 +41,7 @@ #include #include -#include +#include #define GNTTAB_LIST_END GRANT_REF_INVALID diff --git a/sys/xen/hvm.h b/sys/xen/hvm.h index e34a552dc714..5ed31849f959 100644 --- a/sys/xen/hvm.h +++ b/sys/xen/hvm.h @@ -26,12 +26,12 @@ #include #include -#include +#include /** * \brief Wrapper function to obtain a HVM parameter value. * - * \param index HVM parameter index; see . + * \param index HVM parameter index; see . * * \returns 0 on failure; the value of the parameter otherwise. */ diff --git a/sys/xen/hypervisor.h b/sys/xen/hypervisor.h index 2be61597fc18..c42956d253c2 100644 --- a/sys/xen/hypervisor.h +++ b/sys/xen/hypervisor.h @@ -13,14 +13,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include extern uint64_t get_system_time(int ticks); diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 988da24dc878..183724be9749 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -38,11 +38,11 @@ #define __ASSEMBLY__ #endif -#include +#include #ifndef __ASSEMBLY__ #include -#include +#include static inline vm_paddr_t xen_get_xenstore_mfn(void) diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 6725fa9e0399..5ebce0678222 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -33,7 +33,7 @@ #ifndef _XEN_INTR_H_ #define _XEN_INTR_H_ -#include +#include /** Registered Xen interrupt callback handle. */ typedef void * xen_intr_handle_t; diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index bea65fff8e5a..b2957880b187 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -45,9 +45,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 98d60f2646d2..d9b40dfd5f3d 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "xenbus_if.h"