diff mbox series

[Xen-devel] xen/perfc: Fix build after commit fc32575968 when CONFIG_PERF_COUNTERS=y

Message ID 20170921113517.8879-1-julien.grall@arm.com
State Accepted
Commit a2177ad0cb53237c35e78f6c6b9adcd15b6ffb1d
Headers show
Series [Xen-devel] xen/perfc: Fix build after commit fc32575968 when CONFIG_PERF_COUNTERS=y | expand

Commit Message

Julien Grall Sept. 21, 2017, 11:35 a.m. UTC
The commit fc32575968 "public/sysctl: drop unnecessary typedefs and
handles" went a bit too far by replacing all xen_systcl_*_t type to
struct xen_sysctl_*.

However, xen_sysctl_perfc_val_t was a typedef on uint32_t and therefore
is not associated to a structure.

Use xen_sysctl_perfc_val_t to fix the build when CONFIG_PERF_COUNTERS=y

Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/common/perfc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Wei Liu Sept. 21, 2017, 11:38 a.m. UTC | #1
On Thu, Sep 21, 2017 at 12:35:17PM +0100, Julien Grall wrote:
> The commit fc32575968 "public/sysctl: drop unnecessary typedefs and
> handles" went a bit too far by replacing all xen_systcl_*_t type to
> struct xen_sysctl_*.
> 
> However, xen_sysctl_perfc_val_t was a typedef on uint32_t and therefore
> is not associated to a structure.
> 
> Use xen_sysctl_perfc_val_t to fix the build when CONFIG_PERF_COUNTERS=y
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Jan Beulich Sept. 21, 2017, 12:57 p.m. UTC | #2
>>> On 21.09.17 at 13:35, <julien.grall@arm.com> wrote:
> The commit fc32575968 "public/sysctl: drop unnecessary typedefs and
> handles" went a bit too far by replacing all xen_systcl_*_t type to
> struct xen_sysctl_*.
> 
> However, xen_sysctl_perfc_val_t was a typedef on uint32_t and therefore
> is not associated to a structure.
> 
> Use xen_sysctl_perfc_val_t to fix the build when CONFIG_PERF_COUNTERS=y
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Oops, I'm sorry.
Acked-by: Jan Beulich <jbeulich@suse.com>

Jan
diff mbox series

Patch

diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 76051739a5..067567766a 100644
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -153,7 +153,7 @@  void perfc_reset(unsigned char key)
 }
 
 static struct xen_sysctl_perfc_desc perfc_d[NR_PERFCTRS];
-static struct xen_sysctl_perfc_val *perfc_vals;
+static xen_sysctl_perfc_val_t *perfc_vals;
 static unsigned int      perfc_nbr_vals;
 static cpumask_t         perfc_cpumap;
 
@@ -190,7 +190,7 @@  static int perfc_copy_info(XEN_GUEST_HANDLE_64(xen_sysctl_perfc_desc_t) desc,
         }
 
         xfree(perfc_vals);
-        perfc_vals = xmalloc_array(struct xen_sysctl_perfc_val, perfc_nbr_vals);
+        perfc_vals = xmalloc_array(xen_sysctl_perfc_val_t, perfc_nbr_vals);
     }
 
     if ( guest_handle_is_null(desc) )