mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Eliminate unnecessary casts from __trace_var() invocations
This is possible now that its last parameter's type is 'const void *'. Signed-off-by: Jan Beulich <jbeulich@novell.com>
This commit is contained in:
1 parent
4be742c4db
commit
a8a6ca9fe7
9 files changed
+31
-36
No files matched your search
@@ -932,7 +932,7 @@ static void svm_do_nested_pgfault(paddr_t gpa)
|
||||
_d.qualification = 0;
|
||||
_d.mfn = mfn_x(gfn_to_mfn_query(p2m, gfn, &_d.p2mt));
|
||||
|
||||
__trace_var(TRC_HVM_NPF, 0, sizeof(_d), (unsigned char *)&_d);
|
||||
__trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d);
|
||||
}
|
||||
|
||||
if ( hvm_hap_nested_page_fault(gfn) )
|
||||
|
||||
@@ -2082,7 +2082,7 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa)
|
||||
_d.qualification = qualification;
|
||||
_d.mfn = mfn_x(gfn_to_mfn_query(p2m, gfn, &_d.p2mt));
|
||||
|
||||
__trace_var(TRC_HVM_NPF, 0, sizeof(_d), (unsigned char *)&_d);
|
||||
__trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d);
|
||||
}
|
||||
|
||||
if ( (qualification & EPT_GLA_VALID) &&
|
||||
|
||||
@@ -889,7 +889,7 @@ p2m_pod_zero_check_superpage(struct p2m_domain *p2m, unsigned long gfn)
|
||||
t.d = d->domain_id;
|
||||
t.order = 9;
|
||||
|
||||
__trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), (unsigned char *)&t);
|
||||
__trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), &t);
|
||||
}
|
||||
|
||||
/* Finally! We've passed all the checks, and can add the mfn superpage
|
||||
@@ -1004,7 +1004,7 @@ p2m_pod_zero_check(struct p2m_domain *p2m, unsigned long *gfns, int count)
|
||||
t.d = d->domain_id;
|
||||
t.order = 0;
|
||||
|
||||
__trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), (unsigned char *)&t);
|
||||
__trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), &t);
|
||||
}
|
||||
|
||||
/* Add to cache, and account for the new p2m PoD entry */
|
||||
@@ -1178,7 +1178,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, unsigned long gfn,
|
||||
t.d = d->domain_id;
|
||||
t.order = order;
|
||||
|
||||
__trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), (unsigned char *)&t);
|
||||
__trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -1209,7 +1209,7 @@ remap_and_retry:
|
||||
t.gfn = gfn;
|
||||
t.d = d->domain_id;
|
||||
|
||||
__trace_var(TRC_MEM_POD_SUPERPAGE_SPLINTER, 0, sizeof(t), (unsigned char *)&t);
|
||||
__trace_var(TRC_MEM_POD_SUPERPAGE_SPLINTER, 0, sizeof(t), &t);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -1276,7 +1276,7 @@ p2m_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn,
|
||||
t.d = p2m->domain->domain_id;
|
||||
t.order = page_order;
|
||||
|
||||
__trace_var(TRC_MEM_SET_P2M_ENTRY, 0, sizeof(t), (unsigned char *)&t);
|
||||
__trace_var(TRC_MEM_SET_P2M_ENTRY, 0, sizeof(t), &t);
|
||||
}
|
||||
|
||||
#if CONFIG_PAGING_LEVELS >= 4
|
||||
|
||||
@@ -715,7 +715,7 @@ static inline void trace_resync(int event, mfn_t gmfn)
|
||||
{
|
||||
/* Convert gmfn to gfn */
|
||||
unsigned long gfn = mfn_to_gfn(current->domain, gmfn);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(gfn), (unsigned char*)&gfn);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(gfn), &gfn);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1314,8 +1314,7 @@ static inline void trace_shadow_prealloc_unpin(struct domain *d, mfn_t smfn)
|
||||
unsigned long gfn;
|
||||
ASSERT(mfn_valid(smfn));
|
||||
gfn = mfn_to_gfn(d, backpointer(mfn_to_page(smfn)));
|
||||
__trace_var(TRC_SHADOW_PREALLOC_UNPIN, 0/*!tsc*/,
|
||||
sizeof(gfn), (unsigned char*)&gfn);
|
||||
__trace_var(TRC_SHADOW_PREALLOC_UNPIN, 0/*!tsc*/, sizeof(gfn), &gfn);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2200,7 +2199,7 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn)
|
||||
{
|
||||
/* Convert gmfn to gfn */
|
||||
unsigned long gfn = mfn_to_gfn(current->domain, gmfn);
|
||||
__trace_var(TRC_SHADOW_WRMAP_BF, 0/*!tsc*/, sizeof(gfn), (unsigned char*)&gfn);
|
||||
__trace_var(TRC_SHADOW_WRMAP_BF, 0/*!tsc*/, sizeof(gfn), &gfn);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2883,7 +2883,7 @@ static inline void trace_shadow_gen(u32 event, guest_va_t va)
|
||||
if ( tb_init_done )
|
||||
{
|
||||
event |= (GUEST_PAGING_LEVELS-2)<<8;
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(va), (unsigned char*)&va);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(va), &va);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2907,7 +2907,7 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e,
|
||||
d.va = va;
|
||||
d.flags = this_cpu(trace_shadow_path_flags);
|
||||
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), (unsigned char*)&d);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2931,7 +2931,7 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e,
|
||||
d.va = va;
|
||||
d.flags = this_cpu(trace_shadow_path_flags);
|
||||
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), (unsigned char*)&d);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2957,7 +2957,7 @@ static inline void trace_shadow_emulate_other(u32 event,
|
||||
d.gfn=gfn_x(gfn);
|
||||
d.va = va;
|
||||
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), (unsigned char*)&d);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2990,7 +2990,7 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va)
|
||||
#endif
|
||||
d.flags = this_cpu(trace_shadow_path_flags);
|
||||
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), (unsigned char*)&d);
|
||||
__trace_var(event, 0/*!tsc*/, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+12
-15
@@ -25,8 +25,7 @@ asmlinkage void trace_hypercall(void)
|
||||
d.eip = regs->eip;
|
||||
d.eax = regs->eax;
|
||||
|
||||
__trace_var(TRC_PV_HYPERCALL, 1,
|
||||
sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(TRC_PV_HYPERCALL, 1, sizeof(d), &d);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -42,7 +41,7 @@ asmlinkage void trace_hypercall(void)
|
||||
d.eip = regs->eip;
|
||||
d.eax = regs->eax;
|
||||
|
||||
__trace_var(event, 1/*tsc*/, sizeof(d), (unsigned char*)&d);
|
||||
__trace_var(event, 1/*tsc*/, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,8 +63,7 @@ void __trace_pv_trap(int trapnr, unsigned long eip,
|
||||
d.error_code = error_code;
|
||||
d.use_error_code=!!use_error_code;
|
||||
|
||||
__trace_var(TRC_PV_TRAP, 1,
|
||||
sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(TRC_PV_TRAP, 1, sizeof(d), &d);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -85,7 +83,7 @@ void __trace_pv_trap(int trapnr, unsigned long eip,
|
||||
|
||||
event = TRC_PV_TRAP;
|
||||
event |= TRC_64_FLAG;
|
||||
__trace_var(event, 1, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +102,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code)
|
||||
d.addr = addr;
|
||||
d.error_code = error_code;
|
||||
|
||||
__trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), &d);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -120,7 +118,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code)
|
||||
d.error_code = error_code;
|
||||
event = TRC_PV_PAGE_FAULT;
|
||||
event |= TRC_64_FLAG;
|
||||
__trace_var(event, 1, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,13 +128,13 @@ void __trace_trap_one_addr(unsigned event, unsigned long va)
|
||||
if ( is_pv_32on64_vcpu(current) )
|
||||
{
|
||||
u32 d = va;
|
||||
__trace_var(event, 1, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1, sizeof(d), &d);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
event |= TRC_64_FLAG;
|
||||
__trace_var(event, 1, sizeof(va), (unsigned char *)&va);
|
||||
__trace_var(event, 1, sizeof(va), &va);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +149,7 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1,
|
||||
} __attribute__((packed)) d;
|
||||
d.va1=va1;
|
||||
d.va2=va2;
|
||||
__trace_var(event, 1, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1, sizeof(d), &d);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -162,7 +160,7 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1,
|
||||
d.va1=va1;
|
||||
d.va2=va2;
|
||||
event |= TRC_64_FLAG;
|
||||
__trace_var(event, 1, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -189,8 +187,7 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte)
|
||||
d.eip = eip;
|
||||
d.pte = npte;
|
||||
|
||||
__trace_var(TRC_PV_PTWR_EMULATION_PAE, 1,
|
||||
sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(TRC_PV_PTWR_EMULATION_PAE, 1, sizeof(d), &d);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -208,6 +205,6 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte)
|
||||
event = ((CONFIG_PAGING_LEVELS == 3) ?
|
||||
TRC_PV_PTWR_EMULATION_PAE : TRC_PV_PTWR_EMULATION);
|
||||
event |= TRC_64_FLAG;
|
||||
__trace_var(event, 1/*tsc*/, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1/*tsc*/, sizeof(d), &d);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -234,7 +234,7 @@ static void decrease_reservation(struct memop_args *a)
|
||||
t.d = a->domain->domain_id;
|
||||
t.order = a->extent_order;
|
||||
|
||||
__trace_var(TRC_MEM_DECREASE_RESERVATION, 0, sizeof(t), (unsigned char *)&t);
|
||||
__trace_var(TRC_MEM_DECREASE_RESERVATION, 0, sizeof(t), &t);
|
||||
}
|
||||
|
||||
/* See if populate-on-demand wants to handle this */
|
||||
|
||||
@@ -93,7 +93,7 @@ static inline void trace_runstate_change(struct vcpu *v, int new_state)
|
||||
event |= ( v->runstate.state & 0x3 ) << 8;
|
||||
event |= ( new_state & 0x3 ) << 4;
|
||||
|
||||
__trace_var(event, 1/*tsc*/, sizeof(d), (unsigned char *)&d);
|
||||
__trace_var(event, 1/*tsc*/, sizeof(d), &d);
|
||||
}
|
||||
|
||||
static inline void trace_continue_running(struct vcpu *v)
|
||||
@@ -106,8 +106,7 @@ static inline void trace_continue_running(struct vcpu *v)
|
||||
d.vcpu = v->vcpu_id;
|
||||
d.domain = v->domain->domain_id;
|
||||
|
||||
__trace_var(TRC_SCHED_CONTINUE_RUNNING, 1/*tsc*/, sizeof(d),
|
||||
(unsigned char *)&d);
|
||||
__trace_var(TRC_SCHED_CONTINUE_RUNNING, 1/*tsc*/, sizeof(d), &d);
|
||||
}
|
||||
|
||||
static inline void vcpu_urgent_count_update(struct vcpu *v)
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
_d.d[4]=(d5); \
|
||||
_d.d[5]=(d6); \
|
||||
__trace_var(TRC_HVM_ ## evt, cycles, \
|
||||
sizeof(u32)*count+1, (unsigned char *)&_d); \
|
||||
sizeof(u32)*count+1, &_d); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
|
||||