[PATCH v6 00/11] tracing: remove dynamic vcpu state

Alex Bennée posted 11 patches 10 months, 3 weeks ago
Failed in applying to current master (apply log)
There is a newer version of this series
docs/about/deprecated.rst     |  25 +++++---
qapi/trace.json               |  40 ++++++-------
accel/tcg/tb-hash.h           |   6 +-
include/exec/exec-all.h       |   3 -
include/hw/core/cpu.h         |   5 --
include/qemu/xxhash.h         |  23 +++++--
include/user/syscall-trace.h  |   4 --
trace/control-internal.h      |  10 ----
trace/control-vcpu.h          |  63 --------------------
trace/control.h               |  48 ---------------
trace/event-internal.h        |   2 -
accel/tcg/cpu-exec.c          |   7 +--
accel/tcg/tb-maint.c          |   5 +-
accel/tcg/translate-all.c     |   6 --
bsd-user/freebsd/os-syscall.c |   2 -
hw/9pfs/9p.c                  |   5 +-
hw/core/cpu-common.c          |   6 +-
stubs/trace-control.c         |  13 ----
trace/control-target.c        | 109 +++-------------------------------
trace/control.c               |  28 ---------
trace/qmp.c                   |  76 +++---------------------
trace/trace-hmp-cmds.c        |  18 +-----
util/qsp.c                    |   2 +-
hw/core/trace-events          |   3 +
scripts/qapi/gen.py           |   9 ++-
scripts/tracetool/format/c.py |   6 --
scripts/tracetool/format/h.py |  16 +----
trace-events                  |  50 ----------------
28 files changed, 94 insertions(+), 496 deletions(-)
delete mode 100644 trace/control-vcpu.h
[PATCH v6 00/11] tracing: remove dynamic vcpu state
Posted by Alex Bennée 10 months, 3 weeks ago
Hi Stefan,

The references dynamic vcpu tracing support was removed when the
original TCG trace points where removed. However there was still a
legacy of dynamic trace state to track this in cpu.h and extra hash
variables to track TBs. While the removed vcpu tracepoints are not in
generated code (or helpers) they still bring in a bunch of machinery
to manage the state so I've pulled them out. We keep and rename one
(cpu_reset) to a static trace points which dump vcpu->index as it is
useful to f4bug.

v6 new patch to shuffle deprecated, added rth's rb, qapi doc cleanups

Please queue into your tree.

Alex Bennée (11):
  *-user: remove the guest_user_syscall tracepoints
  trace-events: remove the remaining vcpu trace events
  trace: remove vcpu_id from the TraceEvent structure
  scripts/qapi: document the tool that generated the file
  docs/deprecated: move QMP events bellow QMP command section
  qapi: make the vcpu parameters deprecated for 8.1
  trace: remove code that depends on setting vcpu
  trace: remove control-vcpu.h
  tcg: remove the final vestiges of dstate
  hw/9pfs: use qemu_xxhash4
  accel/tcg: include cs_base in our hash calculations

 docs/about/deprecated.rst     |  25 +++++---
 qapi/trace.json               |  40 ++++++-------
 accel/tcg/tb-hash.h           |   6 +-
 include/exec/exec-all.h       |   3 -
 include/hw/core/cpu.h         |   5 --
 include/qemu/xxhash.h         |  23 +++++--
 include/user/syscall-trace.h  |   4 --
 trace/control-internal.h      |  10 ----
 trace/control-vcpu.h          |  63 --------------------
 trace/control.h               |  48 ---------------
 trace/event-internal.h        |   2 -
 accel/tcg/cpu-exec.c          |   7 +--
 accel/tcg/tb-maint.c          |   5 +-
 accel/tcg/translate-all.c     |   6 --
 bsd-user/freebsd/os-syscall.c |   2 -
 hw/9pfs/9p.c                  |   5 +-
 hw/core/cpu-common.c          |   6 +-
 stubs/trace-control.c         |  13 ----
 trace/control-target.c        | 109 +++-------------------------------
 trace/control.c               |  28 ---------
 trace/qmp.c                   |  76 +++---------------------
 trace/trace-hmp-cmds.c        |  18 +-----
 util/qsp.c                    |   2 +-
 hw/core/trace-events          |   3 +
 scripts/qapi/gen.py           |   9 ++-
 scripts/tracetool/format/c.py |   6 --
 scripts/tracetool/format/h.py |  16 +----
 trace-events                  |  50 ----------------
 28 files changed, 94 insertions(+), 496 deletions(-)
 delete mode 100644 trace/control-vcpu.h

-- 
2.39.2

Re: [PATCH v6 00/11] tracing: remove dynamic vcpu state
Posted by Stefan Hajnoczi 10 months, 3 weeks ago
On Fri, May 26, 2023 at 05:53:50PM +0100, Alex Bennée wrote:
> Hi Stefan,
> 
> The references dynamic vcpu tracing support was removed when the
> original TCG trace points where removed. However there was still a
> legacy of dynamic trace state to track this in cpu.h and extra hash
> variables to track TBs. While the removed vcpu tracepoints are not in
> generated code (or helpers) they still bring in a bunch of machinery
> to manage the state so I've pulled them out. We keep and rename one
> (cpu_reset) to a static trace points which dump vcpu->index as it is
> useful to f4bug.
> 
> v6 new patch to shuffle deprecated, added rth's rb, qapi doc cleanups
> 
> Please queue into your tree.
> 
> Alex Bennée (11):
>   *-user: remove the guest_user_syscall tracepoints
>   trace-events: remove the remaining vcpu trace events
>   trace: remove vcpu_id from the TraceEvent structure
>   scripts/qapi: document the tool that generated the file
>   docs/deprecated: move QMP events bellow QMP command section
>   qapi: make the vcpu parameters deprecated for 8.1
>   trace: remove code that depends on setting vcpu
>   trace: remove control-vcpu.h
>   tcg: remove the final vestiges of dstate
>   hw/9pfs: use qemu_xxhash4
>   accel/tcg: include cs_base in our hash calculations
> 
>  docs/about/deprecated.rst     |  25 +++++---
>  qapi/trace.json               |  40 ++++++-------
>  accel/tcg/tb-hash.h           |   6 +-
>  include/exec/exec-all.h       |   3 -
>  include/hw/core/cpu.h         |   5 --
>  include/qemu/xxhash.h         |  23 +++++--
>  include/user/syscall-trace.h  |   4 --
>  trace/control-internal.h      |  10 ----
>  trace/control-vcpu.h          |  63 --------------------
>  trace/control.h               |  48 ---------------
>  trace/event-internal.h        |   2 -
>  accel/tcg/cpu-exec.c          |   7 +--
>  accel/tcg/tb-maint.c          |   5 +-
>  accel/tcg/translate-all.c     |   6 --
>  bsd-user/freebsd/os-syscall.c |   2 -
>  hw/9pfs/9p.c                  |   5 +-
>  hw/core/cpu-common.c          |   6 +-
>  stubs/trace-control.c         |  13 ----
>  trace/control-target.c        | 109 +++-------------------------------
>  trace/control.c               |  28 ---------
>  trace/qmp.c                   |  76 +++---------------------
>  trace/trace-hmp-cmds.c        |  18 +-----
>  util/qsp.c                    |   2 +-
>  hw/core/trace-events          |   3 +
>  scripts/qapi/gen.py           |   9 ++-
>  scripts/tracetool/format/c.py |   6 --
>  scripts/tracetool/format/h.py |  16 +----
>  trace-events                  |  50 ----------------
>  28 files changed, 94 insertions(+), 496 deletions(-)
>  delete mode 100644 trace/control-vcpu.h
> 
> -- 
> 2.39.2
> 

Thanks, applied to my tracing tree:
https://gitlab.com/stefanha/qemu/commits/tracing

Stefan