[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] xenoprof: move asm/ include


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Mon, 30 Oct 2023 14:19:15 +0100
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5RS7ML3zUGduWIOpMzIYiW9tDyouZkunpiHrgT+gfaE=; b=QYy66vO8D5sMfQxaKemYNfWnndLG7TN557Lq8fB8ueFY0Q8hefcBK63+s8apMx5IUlDzkVuNP+EFo9wOy38rIqWMFlEUIMiuQMThgiyflRT5YANYU+WAb3cISQh5gpGugbfxktNDoEHnxFFJezFr/UnqLDxX6SuUMwmofvf/b9KecDogsQI1ojRn4R1aDDnChhkKKFHIWWw70HGif9WSlpB8K5N9qWAjOrxTi8/o5ebXdQ6VzAJv5LEJ8bNDJ8CvwVWhTqIXhmxVPIi6wOQxa4RUfNyHCO4xCDNK5eNq8qa7m0EHLqhmBPLiv2aTs5ENttW0CuwK/vLtzxjijcDw3w==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bjQNCXKmNj4mro9ba8eH5pvt2Jr/AxynQ4QoNH+xLReAN1b4O72580yYoYsYsjxTIF2/SgRe/MvjGGSoyhEEFRli2/G8uJWAjFw2tj9OTMtJiT4hFF4nVTRb9ntv4aa0NMB3VNE6Z/5TEeLpL2tND7j23DOaxK1SOFupXjsIBaUdLKDduarmtZvGvSkfoJYcD0nJUKMyWSzwcsk8RowHM4uqhijD+ZfB23ZLsC3PD60fCjX0u9uGmOOvZ2qwj/kv/WKoi8F2qwlKWIBLjmPPSV2slTcL8ja7lVKm6vHD0FAIs/gWB0fHIbB4OaFZynFXKzMyOLSBtWD0F2+wc8MKzQ==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Bertrand Marquis <bertrand.marquis@xxxxxxx>, Volodymyr Babchuk <volodymyr_babchuk@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Shawn Anastasio <sanastasio@xxxxxxxxxxxxxxxxxxxxx>, Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
  • Delivery-date: Mon, 30 Oct 2023 13:19:20 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

There's no need for xen/xenoprof.h to include the arch header when the
respective config option is off. The only compensation needed is for
svm.c to explicitly include the arch header instead of the common one
(matching what vmx.c and traps.c do).

With that Arm's header can be deleted, and neither RISC-V nor PPC will
need to introduce one.

While there also adjust and move the (prior) inclusion of inttypes.h.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/xen/arch/arm/include/asm/xenoprof.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_XENOPROF_H__
-#define __ASM_XENOPROF_H__
-
-#endif /* __ASM_XENOPROF_H__ */
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- */
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -12,7 +12,6 @@
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/trace.h>
-#include <xen/xenoprof.h>
 
 #include <asm/amd.h>
 #include <asm/apic.h>
@@ -38,6 +37,7 @@
 #include <asm/processor.h>
 #include <asm/p2m.h>
 #include <asm/x86_emulate.h>
+#include <asm/xenoprof.h>
 
 #include <public/sched.h>
 
--- a/xen/include/xen/xenoprof.h
+++ b/xen/include/xen/xenoprof.h
@@ -10,15 +10,15 @@
 #ifndef __XEN_XENOPROF_H__
 #define __XEN_XENOPROF_H__
 
-#include <xen/inttypes.h>
-#include <asm/xenoprof.h>
-
 #define PMU_OWNER_NONE          0
 #define PMU_OWNER_XENOPROF      1
 #define PMU_OWNER_HVM           2
 
 #ifdef CONFIG_XENOPROF
 
+#include <xen/stdint.h>
+#include <asm/xenoprof.h>
+
 struct domain;
 struct vcpu;
 struct cpu_user_regs;



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.