From nobody Sun May 12 22:22:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1694029505; cv=none; d=zohomail.com; s=zohoarc; b=DnXotTBCtPNaoQA/mzopxGjqv97AnVvw+cAHCPdngEBuFl/xyBvemOajEjI+kskW6NrXjZlA4xPsC2nTY3Us1kNeGTAyGOKse6FhI8MeoE2oalWphciERnYtpLFs8LvBhbzjTJBqCNiYDov5gQ+rtwyi2IqCHR7bbKUwticUEBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694029505; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ag/DXDi9KifLSP4rHOgHN27smY2BH4uwqsjc5RshQu8=; b=D9eFoKIOv4HdeqeroCf1Sr3O7zwIAGeJASJ4RMmFexcZGW2FUifoNVbP6/2IZEIeIWzggDE7Ol+BOTX3U5E2nKZrcsHOPaAXSXVZM5tx2EVydlHUDGYol3SLpLp6d+NR/ex8cpM+F6L/EfPEtYFfjUkDPN0QuIHVPlpLwgz6LNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1694029505911874.0855018189369; Wed, 6 Sep 2023 12:45:05 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.596798.930842 (Exim 4.92) (envelope-from ) id 1qdyRx-000748-Bv; Wed, 06 Sep 2023 19:44:29 +0000 Received: by outflank-mailman (output) from mailman id 596798.930842; Wed, 06 Sep 2023 19:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdyRx-000741-9A; Wed, 06 Sep 2023 19:44:29 +0000 Received: by outflank-mailman (input) for mailman id 596798; Wed, 06 Sep 2023 19:44:28 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdyRw-00073p-04 for xen-devel@lists.xenproject.org; Wed, 06 Sep 2023 19:44:28 +0000 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [2a00:1450:4864:20::22d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c96a7b75-4ced-11ee-8783-cb3800f73035; Wed, 06 Sep 2023 21:44:26 +0200 (CEST) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b9338e4695so4081461fa.2 for ; Wed, 06 Sep 2023 12:44:26 -0700 (PDT) Received: from fedora.. ([94.75.70.14]) by smtp.gmail.com with ESMTPSA id x26-20020a19e01a000000b00500d1f67be9sm2895825lfg.43.2023.09.06.12.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 12:44:25 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c96a7b75-4ced-11ee-8783-cb3800f73035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694029466; x=1694634266; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ag/DXDi9KifLSP4rHOgHN27smY2BH4uwqsjc5RshQu8=; b=DTCANIPzBrdRsaspw5WQWEgsJFjDyWRtD4S5xVKvVHFEAbfYA+wes74iAlbc4Y3SxX Ry80UFoTT2BQxX4yzKPvqCMKUyNAVkburTWTNFubKct/IyxlFzXRGNQK2VDpaHd4Zktr t5w3iVm6D7IMAcFm3pJMUSndljcv0TXnBZn2CBnY1QX669MkOKVaDDt1SZ7Hwj3F8mfw gANZNeLtEzuhiES/nH60j+kaA3CStuC2LnBrCFbfRN38Bo0jRo9Z6O9TNtMJgBQp23Vs bQ4D2+ZgW3vlaIEHim+OLQEg+mvsfgGi85rysu7b+pfBdrxP5eMjzRkSZIVBUxewQHw9 v2qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694029466; x=1694634266; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ag/DXDi9KifLSP4rHOgHN27smY2BH4uwqsjc5RshQu8=; b=JSP81xAwAIuqpLZU1lApvt1+5pz5d0vwGw4idjybdMQZvFeJY1z9Jay+UsByWSX3SP Jif3C4P6Mgm3pLx4/Ud3A+t2A3yFLIkEs2h+abXkVD5Z9fT0QtvSLzRAlvBfEYrP+0CG hcqrzfPS9rhLrdYx/coEoaA9+wZ1aVdHSpdHQBHBFWvjDJ8Ep2/KRMJTnqEoPKEyO5Aw GAJF+8nt43CxpqhDY/mCLKeEeNJ80/TaglJ9SDoDjdZWSRFw+CHsrqbSRb2It7zK/PRK Cc6G/OOBaXT0swgMlnlPBnyRsL/R1wEmApDt9w6txV/JG8Zyn9sL+ZOsdqDLB4L/lZJ8 p+WA== X-Gm-Message-State: AOJu0Ywyzv+b/MtcfaJaw3BogZvkwfPRmS/U0lpBc45VrbKg9cBWIcKz 3vBVjLkRG2ldJ0dZJsmxXah0Wzl9dL4= X-Google-Smtp-Source: AGHT+IGRBht1lhtK1OMEEj50GvHmT1e0A5rPXLll/lZSMCg4cF0DLQelAHhqMmAgHD3dgz2EPb0iCA== X-Received: by 2002:ac2:4ecc:0:b0:4f8:586a:8af6 with SMTP id p12-20020ac24ecc000000b004f8586a8af6mr2935163lfr.4.1694029465722; Wed, 06 Sep 2023 12:44:25 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH v5 1/2] xen: asm-generic support Date: Wed, 6 Sep 2023 22:44:21 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1694029508467100001 Content-Type: text/plain; charset="utf-8" Some headers are shared between individual architectures or are empty. To avoid duplication of these headers, asm-generic is introduced. With the following patch, an architecture uses generic headers mentioned in the file arch/$(ARCH)/include/asm/Makefile To use a generic header is needed to add to arch/$(ARCH)/include/asm/Makefile : generic-y +=3D For each mentioned header in arch/$(ARCH)/include/asm/Makefile, the necessary wrapper in arch/$(ARCH)/include/generated/asm will be generated. As the base Makefile.asm-generic from Linux kernel was taken. ( 06c2afb862f9da8 "Linux 6.5-rc1" ). Signed-off-by: Oleksii Kurochko --- Changes in V5: - Update the commit message - Update SPDX license in Makefile. - Remove code related to UML - Include $(src)/Makefile instead of $(kbuild-file)=20 - Update comment message in Makefile.asm-generic - Update .gitignore - Update path to generated headers in CFLAGS. - Use the latest version of Linux's Makefile.asm-generic --- Changes in V4: - introduce asm-generic support - update commit message --- Changes in V3: - Rename stubs dir to asm-generic --- Changes in V2: - Nothing changed. --- .gitignore | 1 + xen/Makefile | 10 +++++- xen/scripts/Makefile.asm-generic | 53 ++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 xen/scripts/Makefile.asm-generic diff --git a/.gitignore b/.gitignore index 50273adb8d..287166f8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -267,6 +267,7 @@ xen/arch/*/efi/efi.h xen/arch/*/efi/pe.c xen/arch/*/efi/runtime.c xen/arch/*/include/asm/asm-offsets.h +xen/arch/*/include/generated xen/build-dir-cppcheck/ xen/common/config_data.S xen/common/config.gz diff --git a/xen/Makefile b/xen/Makefile index f57e5a596c..a86b64303d 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -438,6 +438,7 @@ ifdef building_out_of_srctree endif CFLAGS +=3D -I$(srctree)/include CFLAGS +=3D -I$(srctree)/arch/$(SRCARCH)/include +CFLAGS +=3D -I$(objtree)/arch/$(SRCARCH)/include/generated =20 # Note that link order matters! ALL_OBJS-y :=3D common/built_in.o @@ -580,6 +581,7 @@ _clean: rm -f $(TARGET).efi $(TARGET).efi.map $(TARGET).efi.elf $(TARGET).efi.str= ipped rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h rm -f .banner .allconfig.tmp include/xen/compile.h + rm -rf $(objtree)/arch/*/include/generated =20 .PHONY: _distclean _distclean: clean @@ -589,7 +591,7 @@ $(TARGET).gz: $(TARGET) gzip -n -f -9 < $< > $@.new mv $@.new $@ =20 -$(TARGET): outputmakefile FORCE +$(TARGET): outputmakefile asm-generic FORCE $(Q)$(MAKE) $(build)=3Dtools $(Q)$(MAKE) $(build)=3D. include/xen/compile.h $(Q)$(MAKE) $(build)=3Dinclude all @@ -667,6 +669,12 @@ endif # need-sub-make PHONY +=3D FORCE FORCE: =20 +# Support for using generic headers in asm-generic +PHONY +=3D asm-generic +asm-generic: + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ + obj=3Darch/$(SRCARCH)/include/generated/asm + # Declare the contents of the PHONY variable as phony. We keep that # information in a variable so we can use it in if_changed and friends. .PHONY: $(PHONY) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-ge= neric new file mode 100644 index 0000000000..92a3a741c5 --- /dev/null +++ b/xen/scripts/Makefile.asm-generic @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: GPL-2.0-only +# include/asm-generic contains a lot of files that are used +# verbatim by several architectures. +# +# This Makefile reads the file arch/$(SRCARCH)/include/asm/Makefile +# and for each file listed in this file with generic-y creates +# a small wrapper file in arch/$(SRCARCH)/include/generated/asm. + +PHONY :=3D all +all: + +src :=3D $(subst /generated,,$(obj)) + +include $(srctree)/scripts/Kbuild.include +-include $(src)/Makefile + +redundant :=3D $(filter $(mandatory-y) $(generated-y), $(generic-y)) +redundant +=3D $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src= )/$(f)),$(f))) +redundant :=3D $(sort $(redundant)) +$(if $(redundant),\ + $(warning redundant generic-y found in $(src)/Kbuild: $(redundant))) + +# If arch does not implement mandatory headers, fallback to asm-generic on= es. +mandatory-y :=3D $(filter-out $(generated-y), $(mandatory-y)) +generic-y +=3D $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$= (src)/$(f)),,$(f))) + +generic-y :=3D $(addprefix $(obj)/, $(generic-y)) +generated-y :=3D $(addprefix $(obj)/, $(generated-y)) + +# Remove stale wrappers when the corresponding files are removed from gene= ric-y +old-headers :=3D $(wildcard $(obj)/*.h) +unwanted :=3D $(filter-out $(generic-y) $(generated-y),$(old-headers)) + +quiet_cmd_wrap =3D WRAP $@ + cmd_wrap =3D echo "\#include " > $@ + +quiet_cmd_remove =3D REMOVE $(unwanted) + cmd_remove =3D rm -f $(unwanted) + +all: $(generic-y) + $(if $(unwanted),$(call cmd,remove)) + @: + +$(obj)/%.h: + $(call cmd,wrap) + +# Create output directory. Skip it if at least one old header exists +# since we know the output directory already exists. +ifeq ($(old-headers),) +$(shell mkdir -p $(obj)) +endif + +.PHONY: $(PHONY) --=20 2.41.0 From nobody Sun May 12 22:22:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1694029501; cv=none; d=zohomail.com; s=zohoarc; b=JfD9w9X7tqh/7K4YVB43BaQK9rR5BE+xUb1I1ryQMgoIhwen7lLO2HMCvcGlPo8kauNyhIt2GGAQjyQUi1n1eG27XkMITlGcHmI3utEAw0rQrUdvf7peMf8O444yWCpg6j2VV5UXoc82AFocqr/PbfzXh5eW6BecDqzUL0v+rUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694029501; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6RY7OtZagCYc1AZV4czHy5Fw88OzBUmzWwNM4JA2qmA=; b=WqQF3OSPWkd4nPzaoNHrgLgv57LFjNW77K6NloW61F9TFjDXAi1cO7alHYQ57KnrqJjZoNH7JavDdXTK+y6Ay0E/kv0L67LnB97HcNfl8+wPJYONWhtDviPBoc5cqj9xiauU0b6Kf0D3o0aHUdNnPqEDBixyNscvmMpycCZwygA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1694029501953994.2982101171078; Wed, 6 Sep 2023 12:45:01 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.596800.930863 (Exim 4.92) (envelope-from ) id 1qdyRy-0007Xs-TI; Wed, 06 Sep 2023 19:44:30 +0000 Received: by outflank-mailman (output) from mailman id 596800.930863; Wed, 06 Sep 2023 19:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdyRy-0007Xl-P2; Wed, 06 Sep 2023 19:44:30 +0000 Received: by outflank-mailman (input) for mailman id 596800; Wed, 06 Sep 2023 19:44:29 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdyRx-00073v-HJ for xen-devel@lists.xenproject.org; Wed, 06 Sep 2023 19:44:29 +0000 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [2a00:1450:4864:20::12b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c9ee1acc-4ced-11ee-9b0d-b553b5be7939; Wed, 06 Sep 2023 21:44:27 +0200 (CEST) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-5008d16cc36so227307e87.2 for ; Wed, 06 Sep 2023 12:44:27 -0700 (PDT) Received: from fedora.. ([94.75.70.14]) by smtp.gmail.com with ESMTPSA id x26-20020a19e01a000000b00500d1f67be9sm2895825lfg.43.2023.09.06.12.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 12:44:26 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c9ee1acc-4ced-11ee-9b0d-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694029467; x=1694634267; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6RY7OtZagCYc1AZV4czHy5Fw88OzBUmzWwNM4JA2qmA=; b=LI49whOjcBfJAeyvOZHMkuzaJ0ZG4nkk8hPV07LA4LTh//MXz5MAA1sM79JNUmXSa8 0AUu1svD0EdYAm0qkpbNUSPG+YRyqjNM9jyOjiMiSqyyxUwJEisYLGvXqjllVXFoBcty 0zKVQZopsHvn1F2syejxuCd12oPNt68JRWLRpUMApumhRCNRsWy3A2u7H4L9IN89AtBR KW1bjBryLZkktNhmm665BIwK70B4xH19/G+APGMgubE71fxu+OAxvALn3rBGKWNJJX2n CIWMv3h3bVA416T1ImDKDB4VNfZVYJZqpYvn805Wvm8v6wphRdS37SB//2Lozwlq6sOj Awsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694029467; x=1694634267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6RY7OtZagCYc1AZV4czHy5Fw88OzBUmzWwNM4JA2qmA=; b=IrmjqKqz2QsLSBTYENc7L1o/nQAbhqSZJg5JU7Pr7VYXKEEZT704+5kcS5GLeuiM4q 0jkeqf/R/HCpUVHnpQZ6SAAnzaPuVJa/oGPyzDV8jySPHsOOjqtHfQ9g8hemBu5vD7WU /8poRTTun2iqZcDfVr0R594G7r38Ql8vl7gY4VON54CTVOmKncVpppjehmHJVtrXpdaQ UAzyeQx5GZFjS5jfHYCJr0WWh1Eue7Jxvtxty74iDwCq3ylHA7rG8p/qZi+oLkB7DQD8 39cr7Yvn2HBm9U4WX0Kj+pbMpwV0bwvLLWEA8FjN728eKl7eO6SyYlbnGoVmxoUUs9qV jVWw== X-Gm-Message-State: AOJu0Yxs/ZblD8KwngPwhHS8so8aUejouHuQsaZw9PTVDYhqnAM+zdSV GcwUjj2URbjR5XypcOIhWdK2voxJKXc= X-Google-Smtp-Source: AGHT+IGZPcNLB5HfUF/MMbTWn0yhCJ/MUbMQLijvx07c7PkPj4GQKdwLaxishM2uqyE6oGuGev3iUw== X-Received: by 2002:ac2:5b8f:0:b0:4ff:ae42:19e2 with SMTP id o15-20020ac25b8f000000b004ffae4219e2mr2661589lfn.58.1694029466697; Wed, 06 Sep 2023 12:44:26 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Jan Beulich , Wei Liu Subject: [PATCH v5 2/2] xen: move arm/include/asm/vm_event.h to stubs Date: Wed, 6 Sep 2023 22:44:22 +0300 Message-ID: <108a5bd46316993684bf6325d7843cdfb126a530.1694024884.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1694029504018100003 Content-Type: text/plain; charset="utf-8" asm/vm_event.h is common for ARM and RISC-V so it will be moved to stubs dir. Original asm/vm_event.h from ARM was updated: * use SPDX-License-Identifier. * update comment messages of stubs. * update #ifdef * instead of "include " -> "public/vm_event.h" As vm_event.h was moved to asm-generic then it is needed to create Makefile in arm/include/asm/ and add generated-y +=3D vm_event.h to it. Signed-off-by: Oleksii Kurochko --- Changes in V5: - Update the commit message - Remove Acked-by:... - Switch ARM to use asm-generic/vm_event.h --- Changes in V4: - update path of vm_event.h from include/asm-generic/asm to include/asm-ge= neric --- Changes in V3: - add Acked-by: Stefano Stabellini for "xen: move= arm/include/asm/vm_event.h to asm-generic" - update SPDX tag. - move asm/vm_event.h to asm-generic. --- Changes in V2: - change public/domctl.h to public/vm_event.h. - update commit message of [PATCH v2 2/2] xen: move arm/include/asm/vm_eve= nt.h to stubs --- xen/arch/arm/include/asm/Makefile | 2 + xen/arch/arm/include/asm/vm_event.h | 66 ----------------------------- xen/include/asm-generic/vm_event.h | 55 ++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 66 deletions(-) create mode 100644 xen/arch/arm/include/asm/Makefile delete mode 100644 xen/arch/arm/include/asm/vm_event.h create mode 100644 xen/include/asm-generic/vm_event.h diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/M= akefile new file mode 100644 index 0000000000..821addb0bf --- /dev/null +++ b/xen/arch/arm/include/asm/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +generic-y +=3D vm_event.h diff --git a/xen/arch/arm/include/asm/vm_event.h b/xen/arch/arm/include/asm= /vm_event.h deleted file mode 100644 index 4d861373b3..0000000000 --- a/xen/arch/arm/include/asm/vm_event.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * vm_event.h: architecture specific vm_event handling routines - * - * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or - * more details. - * - * You should have received a copy of the GNU General Public License along= with - * this program; If not, see . - */ - -#ifndef __ASM_ARM_VM_EVENT_H__ -#define __ASM_ARM_VM_EVENT_H__ - -#include -#include - -static inline int vm_event_init_domain(struct domain *d) -{ - /* Nothing to do. */ - return 0; -} - -static inline void vm_event_cleanup_domain(struct domain *d) -{ - memset(&d->monitor, 0, sizeof(d->monitor)); -} - -static inline void vm_event_toggle_singlestep(struct domain *d, struct vcp= u *v, - vm_event_response_t *rsp) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *r= sp) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_emulate_check(struct vcpu *v, vm_event_response_t *rsp) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_sync_event(struct vcpu *v, bool value) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_reset_vmtrace(struct vcpu *v) -{ - /* Not supported on ARM. */ -} - -#endif /* __ASM_ARM_VM_EVENT_H__ */ diff --git a/xen/include/asm-generic/vm_event.h b/xen/include/asm-generic/v= m_event.h new file mode 100644 index 0000000000..29ab1b01b4 --- /dev/null +++ b/xen/include/asm-generic/vm_event.h @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * vm_event.h: stubs for architecture specific vm_event handling routines + * + * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + */ + +#ifndef __ASM_STUB_VM_EVENT_H__ +#define __ASM_STUB_VM_EVENT_H__ + +#include +#include + +static inline int vm_event_init_domain(struct domain *d) +{ + /* Nothing to do. */ + return 0; +} + +static inline void vm_event_cleanup_domain(struct domain *d) +{ + memset(&d->monitor, 0, sizeof(d->monitor)); +} + +static inline void vm_event_toggle_singlestep(struct domain *d, struct vcp= u *v, + vm_event_response_t *rsp) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *r= sp) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_emulate_check(struct vcpu *v, vm_event_response_t *rsp) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_sync_event(struct vcpu *v, bool value) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_reset_vmtrace(struct vcpu *v) +{ + /* Nothing to do. */ +} + +#endif /* __ASM_STUB_VM_EVENT_H__ */ --=20 2.41.0