From patchwork Mon Jul 29 12:16:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 262737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3E49C2C0105 for ; Mon, 29 Jul 2013 22:41:12 +1000 (EST) Received: from localhost ([::1]:51377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3mlC-0005MY-86 for incoming@patchwork.ozlabs.org; Mon, 29 Jul 2013 08:41:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3mkn-0005Hg-Ub for qemu-devel@nongnu.org; Mon, 29 Jul 2013 08:40:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3mkk-00026H-I1 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 08:40:45 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:59052 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3mYf-0004ps-Fa; Mon, 29 Jul 2013 08:28:13 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1V3mNT-0003dP-Fq; Mon, 29 Jul 2013 13:16:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2013 13:16:38 +0100 Message-Id: <1375100199-13934-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375100199-13934-1-git-send-email-peter.maydell@linaro.org> References: <1375100199-13934-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Kevin Wolf , Anthony Liguori , patches@linaro.org, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , Richard Henderson Subject: [Qemu-devel] [PATCH 3/4] target-ppc/kvm.c: Rename 'dprintf' to 'DPRINTF' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org '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 --- 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;