On Wed, Jun 22, 2016 at 12:04:30PM +0200, Lluís Vilanova wrote: > Adds three commandline arguments to the main *-user programs, following what's > already available in softmmu: > > * -trace-enable > * -trace-events > * -trace-file > > > Changes in v2 > ============= > > * Tell user to use 'help' instead of '?' [Eric Blake]. > * Remove newlines on argument docs for bsd-user [Eric Blake]. > > > Signed-off-by: Lluís Vilanova <vilan...@ac.upc.edu> > --- > > Lluís Vilanova (2): > trace: [linux-user] Commandline arguments to control tracing > trace: [bsd-user] Commandline arguments to control tracing > > > bsd-user/main.c | 19 +++++++++++++++++++ > linux-user/main.c | 28 ++++++++++++++++++++++++++++ > 2 files changed, 47 insertions(+)
Hi Lluís,
Commit e9e0bb2af2248eabafb54402e3127f9f8a8690f5 ("trace: move
qemu_trace_opts to trace/control.c") made trace_events_init() static.
This conflicts with your patch series.
I suggest changing this series to use -trace ... just like
qemu/qemu-img/qemu-nbd.
Stefan
signature.asc
Description: PGP signature
