Commit da1c4ec8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging 



# gpg: Signature made Fri 26 Sep 2014 11:59:34 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  ohci: drop computed flags from trace events
  ohci: Split long traces to smaller ones
  scripts/tracetool: don't barf on formats with precision
  trace: install trace-events file
  trace-events: Fix comments pointing to source files
  trace-events: Drop orphaned monitor trace event
  trace-events: Drop unused megasas trace event
  cleanup-trace-events.pl: Tighten search for trace event call
  trace: tighten up trace-events regex to fix bad parse
  trace-events: drop orphan iscsi trace events
  trace-events: drop orphan usb_mtp_data_out
  trace-events: drop orphan virtio_blk_data_plane_complete_request
  trace: [hmp] Reimplement "trace-event" and "info trace-events" using QMP
  trace: [qmp] Add commands to query and control event tracing state
  trace: docs: add trace file description
  trace: [ust] Fix format string computation in tcg-enabled events

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 15124e14 bc0d104c

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ endif 
	set -e; for x in $(KEYMAPS); do \

		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \

	done

	$(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events"

	for d in $(TARGET_DIRS); do \

	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \

        done

block/iscsi.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "qemu/bitops.h"

#include "qemu/bitmap.h"

#include "block/block_int.h"

#include "trace.h"

#include "block/scsi.h"

#include "qemu/iov.h"

#include "sysemu/sysemu.h"

docs/tracing.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ for debugging, profiling, and observing execution. 


4. Pretty-print the binary trace file:



    ./scripts/simpletrace.py trace-events trace-*

    ./scripts/simpletrace.py trace-events trace-* # Override * with QEMU <pid>



== Trace events ==

hw/usb/hcd-ohci.c

+12 −9
Original line number Diff line number Diff line
@@ -723,11 +723,13 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed, 
    trace_usb_ohci_iso_td_head(

           ed->head & OHCI_DPTR_MASK, ed->tail & OHCI_DPTR_MASK,

           iso_td.flags, iso_td.bp, iso_td.next, iso_td.be,

           iso_td.offset[0], iso_td.offset[1], iso_td.offset[2], iso_td.offset[3],

           iso_td.offset[4], iso_td.offset[5], iso_td.offset[6], iso_td.offset[7],

           ohci->frame_number, starting_frame,

           frame_count, relative_frame_number,         

           OHCI_BM(iso_td.flags, TD_DI), OHCI_BM(iso_td.flags, TD_CC));

           frame_count, relative_frame_number);

    trace_usb_ohci_iso_td_head_offset(

           iso_td.offset[0], iso_td.offset[1],

           iso_td.offset[2], iso_td.offset[3],

           iso_td.offset[4], iso_td.offset[5],

           iso_td.offset[6], iso_td.offset[7]);



    if (relative_frame_number < 0) {

        trace_usb_ohci_iso_td_relative_frame_number_neg(relative_frame_number);
@@ -1199,13 +1201,14 @@ static int ohci_service_ed_list(OHCIState *ohci, uint32_t head, int completion) 
        }



        while ((ed.head & OHCI_DPTR_MASK) != ed.tail) {

            trace_usb_ohci_ed_pkt(cur,

            trace_usb_ohci_ed_pkt(cur, (ed.head & OHCI_ED_H) != 0,

                    (ed.head & OHCI_ED_C) != 0, ed.head & OHCI_DPTR_MASK,

                    ed.tail & OHCI_DPTR_MASK, ed.next & OHCI_DPTR_MASK);

            trace_usb_ohci_ed_pkt_flags(

                    OHCI_BM(ed.flags, ED_FA), OHCI_BM(ed.flags, ED_EN),

                    OHCI_BM(ed.flags, ED_D), (ed.flags & OHCI_ED_S)!= 0,

                    (ed.flags & OHCI_ED_K) != 0, (ed.flags & OHCI_ED_F) != 0,

                    OHCI_BM(ed.flags, ED_MPS), (ed.head & OHCI_ED_H) != 0,

                    (ed.head & OHCI_ED_C) != 0, ed.head & OHCI_DPTR_MASK,

                    ed.tail & OHCI_DPTR_MASK, ed.next & OHCI_DPTR_MASK);

                    OHCI_BM(ed.flags, ED_MPS));



            active = 1;

monitor.c

+14 −13
Original line number Diff line number Diff line
@@ -886,19 +886,12 @@ static void do_trace_event_set_state(Monitor *mon, const QDict *qdict) 
{

    const char *tp_name = qdict_get_str(qdict, "name");

    bool new_state = qdict_get_bool(qdict, "option");

    Error *local_err = NULL;



    bool found = false;

    TraceEvent *ev = NULL;

    while ((ev = trace_event_pattern(tp_name, ev)) != NULL) {

        found = true;

        if (!trace_event_get_state_static(ev)) {

            monitor_printf(mon, "event \"%s\" is not traceable\n", tp_name);

        } else {

            trace_event_set_state_dynamic(ev, new_state);

        }

    }

    if (!trace_event_is_pattern(tp_name) && !found) {

        monitor_printf(mon, "unknown event name \"%s\"\n", tp_name);

    qmp_trace_event_set_state(tp_name, new_state, true, true, &local_err);

    if (local_err) {

        qerror_report_err(local_err);

        error_free(local_err);

    }

}
@@ -1079,7 +1072,15 @@ static void do_info_cpu_stats(Monitor *mon, const QDict *qdict) 


static void do_trace_print_events(Monitor *mon, const QDict *qdict)

{

    trace_print_events((FILE *)mon, &monitor_fprintf);

    TraceEventInfoList *events = qmp_trace_event_get_state("*", NULL);

    TraceEventInfoList *elem;



    for (elem = events; elem != NULL; elem = elem->next) {

        monitor_printf(mon, "%s : state %u\n",

                       elem->value->name,

                       elem->value->state == TRACE_EVENT_STATE_ENABLED ? 1 : 0);

    }

    qapi_free_TraceEventInfoList(events);

}



static int client_migrate_info(Monitor *mon, const QDict *qdict,