HVM-785 kvm-cmd build should use CTFMERGE and CTFCONVERT

*** 375,396 ****
  endif # CONFIG_SOFTMMU
  
  obj-y += $(addprefix ../, $(trace-obj-y))
  obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
  
- #
- # Uh, ctfconvert and ctfmerge are in our paths... right... I promise I'll clean
- # this up.
- #
  
  ifeq ($(TRACE_BACKEND),dtrace)
  ifneq ($(strip $(CONFIG_SOLARIS)),)
  $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
          $(call quiet-command, dtrace $(CONFIG_DTRACE_FLAGS) -o ../trace-dtrace.o -s ../trace-dtrace.dtrace -G $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y),"  LINK  $(TARGET_DIR)$@.dtrace")
!         $(call quiet-command, find ../ -type f -name '*.o' -exec ../ctf.sh '{}' \;)
          $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../trace-dtrace.o)
!         $(call CTFMERGE, $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
  else
  $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
          $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
  endif
  else
--- 375,392 ----
  endif # CONFIG_SOFTMMU
  
  obj-y += $(addprefix ../, $(trace-obj-y))
  obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
  
  
  ifeq ($(TRACE_BACKEND),dtrace)
  ifneq ($(strip $(CONFIG_SOLARIS)),)
  $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
          $(call quiet-command, dtrace $(CONFIG_DTRACE_FLAGS) -o ../trace-dtrace.o -s ../trace-dtrace.dtrace -G $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y),"  LINK  $(TARGET_DIR)$@.dtrace")
!         $(call CTFCONVERT_CMD)
          $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../trace-dtrace.o)
!         $(call CTFMERGE_CMD, $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
  else
  $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
          $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
  endif
  else