On 12/07/2010 10:24 AM, Jiri Denemark wrote: ACK. Hmm; should we rename the use of qemudDebug in daemon/libvirtd.c to something more appropriate, as a follow-on cleanup? -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

--- src/qemu/qemu_conf.c | 8 ++++---- src/qemu/qemu_conf.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index d81e6cc..e5d0206 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1449,12 +1449,12 @@ int qemudParseHelpStr(const char *qemu, *flags = qemudComputeCmdFlags(help, *version, *is_kvm, *kvm_version); - qemudDebug("Version %u.%u.%u, cooked version %u, flags %u", - major, minor, micro, *version, *flags); + VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags 0x%llx", + major, minor, micro, *version, *flags); if (*kvm_version) - qemudDebug("KVM version %d detected", *kvm_version); + VIR_DEBUG("KVM version %d detected", *kvm_version); else if (*is_kvm) - qemudDebug("qemu-kvm version %u.%u.%u detected", major, minor, micro); + VIR_DEBUG("qemu-kvm version %u.%u.%u detected", major, minor, micro); return 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a1556cb..71318bf 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -44,8 +44,6 @@ # include "macvtap.h" # include "command.h" -# define qemudDebug(fmt, ...) do {} while(0) - # define QEMUD_CPUMASK_LEN CPU_SETSIZE /* Internal flags to keep track of qemu command line capabilities */ -- 1.7.3.2

Thanks, pushed. Jirka