[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/4] s390x: Rename 'dprintf' to 'DPRINTF'
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 2/4] s390x: Rename 'dprintf' to 'DPRINTF' |
Date: |
Mon, 29 Jul 2013 13:16:37 +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>
---
hw/s390x/s390-virtio-bus.c | 4 ++--
hw/s390x/s390-virtio.c | 4 ++--
target-s390x/kvm.c | 19 ++++++++++---------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 207eb82..f0aa941 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -38,10 +38,10 @@
/* #define DEBUG_S390 */
#ifdef DEBUG_S390
-#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
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index edbde00..439d732 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -41,10 +41,10 @@
//#define DEBUG_S390
#ifdef DEBUG_S390
-#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
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 60e94f8..3ed5855 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/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
@@ -585,7 +585,7 @@ static int handle_priv(S390CPU *cpu, struct kvm_run *run,
uint16_t ipbh0 = (run->s390_sieic.ipb & 0xffff0000) >> 16;
uint8_t ipb = run->s390_sieic.ipb & 0xff;
- dprintf("KVM: PRIV: %d\n", ipa1);
+ DPRINTF("KVM: PRIV: %d\n", ipa1);
switch (ipa1) {
case PRIV_SCLP_CALL:
r = kvm_sclp_service_call(cpu, run, ipbh0);
@@ -598,7 +598,7 @@ static int handle_priv(S390CPU *cpu, struct kvm_run *run,
r = 0;
}
} else {
- dprintf("KVM: unknown PRIV: 0x%x\n", ipa1);
+ DPRINTF("KVM: unknown PRIV: 0x%x\n", ipa1);
r = -1;
}
break;
@@ -631,7 +631,7 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run,
int ipb_code)
sleep(10);
break;
default:
- dprintf("KVM: unknown DIAG: 0x%x\n", ipb_code);
+ DPRINTF("KVM: unknown DIAG: 0x%x\n", ipb_code);
r = -1;
break;
}
@@ -644,7 +644,7 @@ static int s390_cpu_restart(S390CPU *cpu)
kvm_s390_interrupt(cpu, KVM_S390_RESTART, 0);
s390_add_running_cpu(cpu);
qemu_cpu_kick(CPU(cpu));
- dprintf("DONE: SIGP cpu restart: %p\n", &cpu->env);
+ DPRINTF("DONE: SIGP cpu restart: %p\n", &cpu->env);
return 0;
}
@@ -672,7 +672,7 @@ static int s390_cpu_initial_reset(S390CPU *cpu)
env->regs[i] = 0;
}
- dprintf("DONE: SIGP initial reset: %p\n", env);
+ DPRINTF("DONE: SIGP initial reset: %p\n", env);
return 0;
}
@@ -741,7 +741,8 @@ static int handle_instruction(S390CPU *cpu, struct kvm_run
*run)
int ipb_code = (run->s390_sieic.ipb & 0x0fff0000) >> 16;
int r = -1;
- dprintf("handle_instruction 0x%x 0x%x\n", run->s390_sieic.ipa,
run->s390_sieic.ipb);
+ DPRINTF("handle_instruction 0x%x 0x%x\n",
+ run->s390_sieic.ipa, run->s390_sieic.ipb);
switch (ipa0) {
case IPA0_B2:
case IPA0_B9:
@@ -775,7 +776,7 @@ static int handle_intercept(S390CPU *cpu)
int icpt_code = run->s390_sieic.icptcode;
int r = 0;
- dprintf("intercept: 0x%x (at 0x%lx)\n", icpt_code,
+ DPRINTF("intercept: 0x%x (at 0x%lx)\n", icpt_code,
(long)cs->kvm_run->psw_addr);
switch (icpt_code) {
case ICPT_INSTRUCTION:
--
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 <=
- [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, 2013/07/29
- 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