xen/arch/x86/oprofile/nmi_int.c | 4 ++--
xen/arch/x86/oprofile/op_model_ppro.c | 9 +++++----
xen/include/asm-x86/hvm/vpmu.h | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
This patch renames the define PASSIVE_DOMAIN_ALLOCATED to follow the
same scheme of the other defines.
Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
diff -r 9c899074f7ed xen/arch/x86/oprofile/nmi_int.c
--- a/xen/arch/x86/oprofile/nmi_int.c Wed Feb 08 12:26:01 2012 +0100
+++ b/xen/arch/x86/oprofile/nmi_int.c Wed Feb 08 12:28:47 2012 +0100
@@ -47,7 +47,7 @@ static int passive_domain_msr_op_checks(
if ( !model->is_arch_pmu_msr(msr, typep, indexp) )
return 0;
- if ( !vpmu_is_set(vpmu, PASSIVE_DOMAIN_ALLOCATED) )
+ if ( !vpmu_is_set(vpmu, VPMU_PASSIVE_DOMAIN_ALLOCATED) )
if ( ! model->allocated_msr(current) )
return 0;
return 1;
@@ -78,7 +78,7 @@ int passive_domain_do_wrmsr(unsigned int
void passive_domain_destroy(struct vcpu *v)
{
struct vpmu_struct *vpmu = vcpu_vpmu(v);
- if ( vpmu_is_set(vpmu, PASSIVE_DOMAIN_ALLOCATED) )
+ if ( vpmu_is_set(vpmu, VPMU_PASSIVE_DOMAIN_ALLOCATED) )
model->free_msr(v);
}
diff -r 9c899074f7ed xen/arch/x86/oprofile/op_model_ppro.c
--- a/xen/arch/x86/oprofile/op_model_ppro.c Wed Feb 08 12:26:01 2012 +0100
+++ b/xen/arch/x86/oprofile/op_model_ppro.c Wed Feb 08 12:28:47 2012 +0100
@@ -143,7 +143,8 @@ static int ppro_check_ctrs(unsigned int
xenoprof_log_event(current, regs, eip, mode, i);
wrmsrl(msrs->counters[i].addr, -reset_value[i]);
if ( is_passive(current->domain) && (mode != 2) &&
- vpmu_is_set(vcpu_vpmu(current), PASSIVE_DOMAIN_ALLOCATED) )
+ vpmu_is_set(vcpu_vpmu(current),
+ VPMU_PASSIVE_DOMAIN_ALLOCATED) )
{
if ( IS_ACTIVE(msrs_content[i].control) )
{
@@ -231,7 +232,7 @@ static int ppro_allocate_msr(struct vcpu
goto out;
vpmu->context = (void *)msr_content;
vpmu_clear(vpmu);
- vpmu_set(vpmu, PASSIVE_DOMAIN_ALLOCATED);
+ vpmu_set(vpmu, VPMU_PASSIVE_DOMAIN_ALLOCATED);
return 1;
out:
gdprintk(XENLOG_WARNING, "Insufficient memory for oprofile,
oprofile is "
@@ -244,10 +245,10 @@ static void ppro_free_msr(struct vcpu *v
{
struct vpmu_struct *vpmu = vcpu_vpmu(v);
- if ( !vpmu_is_set(vpmu, PASSIVE_DOMAIN_ALLOCATED) )
+ if ( !vpmu_is_set(vpmu, VPMU_PASSIVE_DOMAIN_ALLOCATED) )
return;
xfree(vpmu->context);
- vpmu_reset(vpmu, PASSIVE_DOMAIN_ALLOCATED);
+ vpmu_reset(vpmu, VPMU_PASSIVE_DOMAIN_ALLOCATED);
}
static void ppro_load_msr(struct vcpu *v, int type, int index, u64
*msr_content)
diff -r 9c899074f7ed xen/include/asm-x86/hvm/vpmu.h
--- a/xen/include/asm-x86/hvm/vpmu.h Wed Feb 08 12:26:01 2012 +0100
+++ b/xen/include/asm-x86/hvm/vpmu.h Wed Feb 08 12:28:47 2012 +0100
@@ -68,7 +68,7 @@ struct vpmu_struct {
#define VPMU_CONTEXT_ALLOCATED 0x1
#define VPMU_CONTEXT_LOADED 0x2
#define VPMU_RUNNING 0x4
-#define PASSIVE_DOMAIN_ALLOCATED 0x8
+#define VPMU_PASSIVE_DOMAIN_ALLOCATED 0x8
#define vpmu_set(_vpmu, _x) ((_vpmu)->flags |= (_x))
#define vpmu_reset(_vpmu, _x) ((_vpmu)->flags &= ~(_x))
--
Company details: http://ts.fujitsu.com/imprint.html