[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] target-ppc/kvm.c: Rename 'dprintf' to 'DPRINTF'
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 3/4] target-ppc/kvm.c: Rename 'dprintf' to 'DPRINTF' |
Date: |
Mon, 29 Jul 2013 13:16:38 +0100 |
'dprintf' is the name of a POSIX standard function so we should not be
stealing it for our debug macro. Rename to 'DPRINTF' (in line with
a number of other source files.)
Signed-off-by: Peter Maydell <address@hidden>
---
target-ppc/kvm.c | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index b0099e1..7ba2224 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -40,10 +40,10 @@
//#define DEBUG_KVM
#ifdef DEBUG_KVM
-#define dprintf(fmt, ...) \
+#define DPRINTF(fmt, ...) \
do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
#else
-#define dprintf(fmt, ...) \
+#define DPRINTF(fmt, ...) \
do { } while (0)
#endif
@@ -548,7 +548,7 @@ static int kvm_put_fp(CPUState *cs)
reg.addr = (uintptr_t)&fpscr;
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set FPSCR to KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to set FPSCR to KVM: %s\n", strerror(errno));
return ret;
}
@@ -562,7 +562,7 @@ static int kvm_put_fp(CPUState *cs)
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set %s%d to KVM: %s\n", vsx ? "VSR" : "FPR",
+ DPRINTF("Unable to set %s%d to KVM: %s\n", vsx ? "VSR" : "FPR",
i, strerror(errno));
return ret;
}
@@ -574,7 +574,7 @@ static int kvm_put_fp(CPUState *cs)
reg.addr = (uintptr_t)&env->vscr;
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set VSCR to KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to set VSCR to KVM: %s\n", strerror(errno));
return ret;
}
@@ -583,7 +583,7 @@ static int kvm_put_fp(CPUState *cs)
reg.addr = (uintptr_t)&env->avr[i];
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set VR%d to KVM: %s\n", i, strerror(errno));
+ DPRINTF("Unable to set VR%d to KVM: %s\n", i, strerror(errno));
return ret;
}
}
@@ -608,7 +608,7 @@ static int kvm_get_fp(CPUState *cs)
reg.addr = (uintptr_t)&fpscr;
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get FPSCR from KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to get FPSCR from KVM: %s\n", strerror(errno));
return ret;
} else {
env->fpscr = fpscr;
@@ -622,7 +622,7 @@ static int kvm_get_fp(CPUState *cs)
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get %s%d from KVM: %s\n",
+ DPRINTF("Unable to get %s%d from KVM: %s\n",
vsx ? "VSR" : "FPR", i, strerror(errno));
return ret;
} else {
@@ -639,7 +639,7 @@ static int kvm_get_fp(CPUState *cs)
reg.addr = (uintptr_t)&env->vscr;
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get VSCR from KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to get VSCR from KVM: %s\n", strerror(errno));
return ret;
}
@@ -648,7 +648,7 @@ static int kvm_get_fp(CPUState *cs)
reg.addr = (uintptr_t)&env->avr[i];
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get VR%d from KVM: %s\n",
+ DPRINTF("Unable to get VR%d from KVM: %s\n",
i, strerror(errno));
return ret;
}
@@ -670,7 +670,7 @@ static int kvm_get_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->vpa_addr;
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get VPA address from KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to get VPA address from KVM: %s\n", strerror(errno));
return ret;
}
@@ -680,7 +680,7 @@ static int kvm_get_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->slb_shadow_addr;
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get SLB shadow state from KVM: %s\n",
+ DPRINTF("Unable to get SLB shadow state from KVM: %s\n",
strerror(errno));
return ret;
}
@@ -690,7 +690,7 @@ static int kvm_get_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->dtl_addr;
ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to get dispatch trace log state from KVM: %s\n",
+ DPRINTF("Unable to get dispatch trace log state from KVM: %s\n",
strerror(errno));
return ret;
}
@@ -716,7 +716,7 @@ static int kvm_put_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->vpa_addr;
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set VPA address to KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to set VPA address to KVM: %s\n", strerror(errno));
return ret;
}
}
@@ -727,7 +727,7 @@ static int kvm_put_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->slb_shadow_addr;
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set SLB shadow state to KVM: %s\n",
strerror(errno));
+ DPRINTF("Unable to set SLB shadow state to KVM: %s\n",
strerror(errno));
return ret;
}
@@ -736,7 +736,7 @@ static int kvm_put_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->dtl_addr;
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set dispatch trace log state to KVM: %s\n",
+ DPRINTF("Unable to set dispatch trace log state to KVM: %s\n",
strerror(errno));
return ret;
}
@@ -746,7 +746,7 @@ static int kvm_put_vpa(CPUState *cs)
reg.addr = (uintptr_t)&env->vpa_addr;
ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®);
if (ret < 0) {
- dprintf("Unable to set VPA address to KVM: %s\n", strerror(errno));
+ DPRINTF("Unable to set VPA address to KVM: %s\n", strerror(errno));
return ret;
}
}
@@ -864,7 +864,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
#ifdef TARGET_PPC64
if (cap_papr) {
if (kvm_put_vpa(cs) < 0) {
- dprintf("Warning: Unable to set VPA information to KVM\n");
+ DPRINTF("Warning: Unable to set VPA information to KVM\n");
}
}
#endif /* TARGET_PPC64 */
@@ -1073,7 +1073,7 @@ int kvm_arch_get_registers(CPUState *cs)
#ifdef TARGET_PPC64
if (cap_papr) {
if (kvm_get_vpa(cs) < 0) {
- dprintf("Warning: Unable to get VPA information from KVM\n");
+ DPRINTF("Warning: Unable to get VPA information from KVM\n");
}
}
#endif
@@ -1127,7 +1127,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)
*/
irq = KVM_INTERRUPT_SET;
- dprintf("injected interrupt %d\n", irq);
+ DPRINTF("injected interrupt %d\n", irq);
r = kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &irq);
if (r < 0) {
printf("cpu %d fail inject %x\n", cs->cpu_index, irq);
@@ -1191,20 +1191,20 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run
*run)
switch (run->exit_reason) {
case KVM_EXIT_DCR:
if (run->dcr.is_write) {
- dprintf("handle dcr write\n");
+ DPRINTF("handle dcr write\n");
ret = kvmppc_handle_dcr_write(env, run->dcr.dcrn, run->dcr.data);
} else {
- dprintf("handle dcr read\n");
+ DPRINTF("handle dcr read\n");
ret = kvmppc_handle_dcr_read(env, run->dcr.dcrn, &run->dcr.data);
}
break;
case KVM_EXIT_HLT:
- dprintf("handle halt\n");
+ DPRINTF("handle halt\n");
ret = kvmppc_handle_halt(cpu);
break;
#if defined(TARGET_PPC64)
case KVM_EXIT_PAPR_HCALL:
- dprintf("handle PAPR hypercall\n");
+ DPRINTF("handle PAPR hypercall\n");
run->papr_hcall.ret = spapr_hypercall(cpu,
run->papr_hcall.nr,
run->papr_hcall.args);
@@ -1212,12 +1212,12 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run
*run)
break;
#endif
case KVM_EXIT_EPR:
- dprintf("handle epr\n");
+ DPRINTF("handle epr\n");
run->epr.epr = ldl_phys(env->mpic_iack);
ret = 0;
break;
case KVM_EXIT_WATCHDOG:
- dprintf("handle watchdog expiry\n");
+ DPRINTF("handle watchdog expiry\n");
watchdog_perform_action();
ret = 0;
break;
--
1.7.9.5
- [Qemu-devel] [PATCH 0/4] Rename all 'dprintf' macros to 'DPRINTF', Peter Maydell, 2013/07/29
- [Qemu-devel] [PATCH 2/4] s390x: Rename 'dprintf' to 'DPRINTF', Peter Maydell, 2013/07/29
- [Qemu-devel] [PATCH 4/4] spapr: Rename 'dprintf' to 'DPRINTF', Peter Maydell, 2013/07/29
- [Qemu-devel] [PATCH 1/4] block/sheepdog: Rename 'dprintf' to 'DPRINTF', Peter Maydell, 2013/07/29
- [Qemu-devel] [PATCH 3/4] target-ppc/kvm.c: Rename 'dprintf' to 'DPRINTF',
Peter Maydell <=
- Re: [Qemu-devel] [PATCH 0/4] Rename all 'dprintf' macros to 'DPRINTF', Richard Henderson, 2013/07/29
- Re: [Qemu-devel] [PATCH 0/4] Rename all 'dprintf' macros to 'DPRINTF', Andreas Färber, 2013/07/29