From 8c0d577eb5e5255333e43bd4b89dc3a266f03685 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 18 Apr 2010 14:22:14 +0000 Subject: [PATCH] kvm: avoid collision with dprintf macro in stdio.h, spotted by clang Fixes clang errors: CC i386-softmmu/kvm.o /src/qemu/target-i386/kvm.c:40:9: error: 'dprintf' macro redefined In file included from /src/qemu/target-i386/kvm.c:21: In file included from /src/qemu/qemu-common.h:27: In file included from /usr/include/stdio.h:910: /usr/include/bits/stdio2.h:189:12: note: previous definition is here CC i386-softmmu/kvm-all.o /src/qemu/kvm-all.c:39:9: error: 'dprintf' macro redefined In file included from /src/qemu/kvm-all.c:23: In file included from /src/qemu/qemu-common.h:27: In file included from /usr/include/stdio.h:910: /usr/include/bits/stdio2.h:189:12: note: previous definition is here Signed-off-by: Blue Swirl --- kvm-all.c | 40 ++++++++++++++++++++-------------------- target-i386/kvm.c | 10 +++++----- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 7aa5e57e88..065fd6a250 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -33,10 +33,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 @@ -173,11 +173,11 @@ int kvm_init_vcpu(CPUState *env) long mmap_size; int ret; - dprintf("kvm_init_vcpu\n"); + DPRINTF("kvm_init_vcpu\n"); ret = kvm_vm_ioctl(s, KVM_CREATE_VCPU, env->cpu_index); if (ret < 0) { - dprintf("kvm_create_vcpu failed\n"); + DPRINTF("kvm_create_vcpu failed\n"); goto err; } @@ -186,7 +186,7 @@ int kvm_init_vcpu(CPUState *env) mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0); if (mmap_size < 0) { - dprintf("KVM_GET_VCPU_MMAP_SIZE failed\n"); + DPRINTF("KVM_GET_VCPU_MMAP_SIZE failed\n"); goto err; } @@ -194,7 +194,7 @@ int kvm_init_vcpu(CPUState *env) env->kvm_fd, 0); if (env->kvm_run == MAP_FAILED) { ret = -errno; - dprintf("mmap'ing vcpu state failed\n"); + DPRINTF("mmap'ing vcpu state failed\n"); goto err; } @@ -325,7 +325,7 @@ static int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, d.slot = mem->slot; if (kvm_vm_ioctl(s, KVM_GET_DIRTY_LOG, &d) == -1) { - dprintf("ioctl failed %d\n", errno); + DPRINTF("ioctl failed %d\n", errno); ret = -1; break; } @@ -768,12 +768,12 @@ int kvm_cpu_exec(CPUState *env) struct kvm_run *run = env->kvm_run; int ret; - dprintf("kvm_cpu_exec()\n"); + DPRINTF("kvm_cpu_exec()\n"); do { #ifndef CONFIG_IOTHREAD if (env->exit_request) { - dprintf("interrupt exit requested\n"); + DPRINTF("interrupt exit requested\n"); ret = 0; break; } @@ -792,13 +792,13 @@ int kvm_cpu_exec(CPUState *env) if (ret == -EINTR || ret == -EAGAIN) { cpu_exit(env); - dprintf("io window exit\n"); + DPRINTF("io window exit\n"); ret = 0; break; } if (ret < 0) { - dprintf("kvm run failed %s\n", strerror(-ret)); + DPRINTF("kvm run failed %s\n", strerror(-ret)); abort(); } @@ -807,7 +807,7 @@ int kvm_cpu_exec(CPUState *env) ret = 0; /* exit loop */ switch (run->exit_reason) { case KVM_EXIT_IO: - dprintf("handle_io\n"); + DPRINTF("handle_io\n"); ret = kvm_handle_io(run->io.port, (uint8_t *)run + run->io.data_offset, run->io.direction, @@ -815,7 +815,7 @@ int kvm_cpu_exec(CPUState *env) run->io.count); break; case KVM_EXIT_MMIO: - dprintf("handle_mmio\n"); + DPRINTF("handle_mmio\n"); cpu_physical_memory_rw(run->mmio.phys_addr, run->mmio.data, run->mmio.len, @@ -823,24 +823,24 @@ int kvm_cpu_exec(CPUState *env) ret = 1; break; case KVM_EXIT_IRQ_WINDOW_OPEN: - dprintf("irq_window_open\n"); + DPRINTF("irq_window_open\n"); break; case KVM_EXIT_SHUTDOWN: - dprintf("shutdown\n"); + DPRINTF("shutdown\n"); qemu_system_reset_request(); ret = 1; break; case KVM_EXIT_UNKNOWN: - dprintf("kvm_exit_unknown\n"); + DPRINTF("kvm_exit_unknown\n"); break; case KVM_EXIT_FAIL_ENTRY: - dprintf("kvm_exit_fail_entry\n"); + DPRINTF("kvm_exit_fail_entry\n"); break; case KVM_EXIT_EXCEPTION: - dprintf("kvm_exit_exception\n"); + DPRINTF("kvm_exit_exception\n"); break; case KVM_EXIT_DEBUG: - dprintf("kvm_exit_debug\n"); + DPRINTF("kvm_exit_debug\n"); #ifdef KVM_CAP_SET_GUEST_DEBUG if (kvm_arch_debug(&run->debug.arch)) { gdb_set_stop_cpu(env); @@ -853,7 +853,7 @@ int kvm_cpu_exec(CPUState *env) #endif /* KVM_CAP_SET_GUEST_DEBUG */ break; default: - dprintf("kvm_arch_handle_exit\n"); + DPRINTF("kvm_arch_handle_exit\n"); ret = kvm_arch_handle_exit(env, run); break; } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index f77e4880b3..5513472e8e 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -34,10 +34,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 @@ -957,7 +957,7 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) struct kvm_interrupt intr; intr.irq = irq; /* FIXME: errors */ - dprintf("injected interrupt %d\n", irq); + DPRINTF("injected interrupt %d\n", irq); kvm_vcpu_ioctl(env, KVM_INTERRUPT, &intr); } } @@ -971,7 +971,7 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) else run->request_interrupt_window = 0; - dprintf("setting tpr\n"); + DPRINTF("setting tpr\n"); run->cr8 = cpu_get_apic_tpr(env); return 0; @@ -1009,7 +1009,7 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) switch (run->exit_reason) { case KVM_EXIT_HLT: - dprintf("handle_hlt\n"); + DPRINTF("handle_hlt\n"); ret = kvm_handle_halt(env); break; }