From patchwork Thu Mar 4 13:03:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12116231 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B4A3C433DB for ; Thu, 4 Mar 2021 13:04:11 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26C4A60200 for ; Thu, 4 Mar 2021 13:04:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26C4A60200 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.93249.176008 (Exim 4.92) (envelope-from ) id 1lHne6-0006Dk-Fs; Thu, 04 Mar 2021 13:04:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 93249.176008; Thu, 04 Mar 2021 13:04:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHne6-0006Dd-Cb; Thu, 04 Mar 2021 13:04:02 +0000 Received: by outflank-mailman (input) for mailman id 93249; Thu, 04 Mar 2021 13:04:01 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHne5-0006DY-7j for xen-devel@lists.xenproject.org; Thu, 04 Mar 2021 13:04:01 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id eaf45cda-b1d2-4979-8a68-49fe884de5fe; Thu, 04 Mar 2021 13:04:00 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: eaf45cda-b1d2-4979-8a68-49fe884de5fe DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614863040; h=from:to:cc:subject:date:message-id:mime-version; bh=6yeqZ2hyEsOZnGmzk5/LzUrXnUcg/Pev2FcGRnugMjo=; b=NzQSDxipAIVOZwPzXyVQWWoJNJglScR8PpE12PIb5SMxdDFKJPAB87Sd EGYqXuIhuToI0k48uqUpil/z/fpv239LSfvA3H0Ln1fhCTxu7/VFnRpS2 l1U+5a88Ftrbuj+L7UyS3s4EoqHEi/WZcHqQ2yANDk3Iu7UlHk1R+RF45 A=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: HEPw8YoRK2tzwwUtRR+AO7OO7L8AUlhvzVTYqvR8/IwfCpDsVVJbaJ7jfe+6j3nLNtLZmd2xpQ AoPkfPeIyYKLbimGiUMPHYlZ68JOgGTgKINJZEhduVC/csrQmYzihgg7G7hA2ignlsCUDikp1g /GkO6KGny4u1Tam4hwFkkJ/CHZEj+mhkv2eUKeqFnMlZ7F93/bxmKtXm2fgsAMRVj8HfU1WAgY eAJVFIC6IjI+XSWq71XvvO/nK3pj3FX4pK5TjGNgS6scS8Y+72/qM45lnltUlFwWFYVQT3/v6M t34= X-SBRS: 5.1 X-MesageID: 39936864 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,222,1610427600"; d="scan'208";a="39936864" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Ian Jackson , Wei Liu Subject: [PATCH for-4.15] tools/libxendevicemodel: Strip __XEN_TOOLS__ header guard Date: Thu, 4 Mar 2021 13:03:19 +0000 Message-ID: <20210304130319.10719-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 This is inappropriate for the header file of a standalone library with stable API and ABI. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson --- CC: Ian Jackson CC: Wei Liu Discovered when trying to actually remove the use of unstable libraries from a trivial userspace emulator. Current users of xendevicemodel.h inherit __XEN_TOOLS__ from libxenctrl.h (or equiv). --- tools/include/xendevicemodel.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/include/xendevicemodel.h b/tools/include/xendevicemodel.h index 33698d67f3..797e0c6b29 100644 --- a/tools/include/xendevicemodel.h +++ b/tools/include/xendevicemodel.h @@ -17,8 +17,6 @@ #ifndef XENDEVICEMODEL_H #define XENDEVICEMODEL_H -#ifdef __XEN_TOOLS__ - #include #include @@ -377,8 +375,6 @@ int xendevicemodel_nr_vcpus( */ int xendevicemodel_restrict(xendevicemodel_handle *dmod, domid_t domid); -#endif /* __XEN_TOOLS__ */ - #endif /* XENDEVICEMODEL_H */ /*