# HG changeset patch
# User Steven Hand <steven@xxxxxxxxxxxxx>
# Node ID 7210b62802be9d2785b7df65d11798f68019ee49
# Parent 78a25a7eac1f9b415f24234c6d243025cee17169
Fix hypervisor build with performance counters after -unstable
cset 11257:86d26e6ec89b
Signed-off-by: Steve Dobbelstein <steved@xxxxxxxxxx>
---
xen/common/perfc.c | 15 ++++++++-------
xen/common/sysctl.c | 6 +++---
2 files changed, 11 insertions(+), 10 deletions(-)
diff -r 78a25a7eac1f -r 7210b62802be xen/common/perfc.c
--- a/xen/common/perfc.c Mon Aug 28 21:40:42 2006 +0100
+++ b/xen/common/perfc.c Mon Aug 28 21:57:34 2006 +0100
@@ -7,6 +7,7 @@
#include <xen/spinlock.h>
#include <xen/mm.h>
#include <xen/guest_access.h>
+#include <public/sysctl.h>
#include <asm/perfc.h>
#undef PERFCOUNTER
@@ -131,12 +132,12 @@ void perfc_reset(unsigned char key)
arch_perfc_reset ();
}
-static dom0_perfc_desc_t perfc_d[NR_PERFCTRS];
-static dom0_perfc_val_t *perfc_vals;
+static xen_sysctl_perfc_desc_t perfc_d[NR_PERFCTRS];
+static xen_sysctl_perfc_val_t *perfc_vals;
static int perfc_nbr_vals;
static int perfc_init = 0;
-static int perfc_copy_info(XEN_GUEST_HANDLE(dom0_perfc_desc_t) desc,
- XEN_GUEST_HANDLE(dom0_perfc_val_t) val)
+static int perfc_copy_info(XEN_GUEST_HANDLE_64(xen_sysctl_perfc_desc_t) desc,
+ XEN_GUEST_HANDLE_64(xen_sysctl_perfc_val_t) val)
{
unsigned int i, j;
unsigned int v = 0;
@@ -171,7 +172,7 @@ static int perfc_copy_info(XEN_GUEST_HAN
}
perfc_nbr_vals += perfc_d[i].nr_vals;
}
- perfc_vals = xmalloc_array(dom0_perfc_val_t, perfc_nbr_vals);
+ perfc_vals = xmalloc_array(xen_sysctl_perfc_val_t, perfc_nbr_vals);
perfc_init = 1;
}
if (perfc_vals == NULL)
@@ -206,7 +207,7 @@ static int perfc_copy_info(XEN_GUEST_HAN
}
BUG_ON(v != perfc_nbr_vals);
- if (copy_to_guest(desc, (dom0_perfc_desc_t *)perfc_d, NR_PERFCTRS))
+ if (copy_to_guest(desc, (xen_sysctl_perfc_desc_t *)perfc_d, NR_PERFCTRS))
return -EFAULT;
if (copy_to_guest(val, perfc_vals, perfc_nbr_vals))
return -EFAULT;
@@ -214,7 +215,7 @@ static int perfc_copy_info(XEN_GUEST_HAN
}
/* Dom0 control of perf counters */
-int perfc_control(dom0_perfccontrol_t *pc)
+int perfc_control(xen_sysctl_perfc_op_t *pc)
{
static DEFINE_SPINLOCK(lock);
int rc;
diff -r 78a25a7eac1f -r 7210b62802be xen/common/sysctl.c
--- a/xen/common/sysctl.c Mon Aug 28 21:40:42 2006 +0100
+++ b/xen/common/sysctl.c Mon Aug 28 21:57:34 2006 +0100
@@ -121,10 +121,10 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysc
break;
#ifdef PERF_COUNTERS
- case XEN_SYSCTL_perfccontrol:
+ case XEN_SYSCTL_perfc_op:
{
- extern int perfc_control(xen_sysctl_perfccontrol_t *);
- ret = perfc_control(&op->u.perfccontrol);
+ extern int perfc_control(xen_sysctl_perfc_op_t *);
+ ret = perfc_control(&op->u.perfc_op);
if ( copy_to_guest(u_sysctl, op, 1) )
ret = -EFAULT;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home