Failed in applying to current master (
apply log)
hw/block/fdc.c | 6 ++---
hw/block/pflash_cfi01.c | 42 ++++++++++++--------------------
hw/block/pflash_cfi02.c | 18 +++++++-------
hw/char/parallel.c | 16 +++++++++---
hw/char/serial.c | 5 ++--
hw/input/tsc2005.c | 7 +++---
hw/net/etraxfs_eth.c | 8 +++---
hw/net/ne2000.c | 25 ++++++++++---------
hw/block/trace-events | 17 +++++++++++++
hw/char/trace-events | 8 ++++++
hw/input/trace-events | 3 +++
hw/net/trace-events | 11 +++++++++
hw/sd/trace-events | 2 +-
scripts/simpletrace.py | 2 +-
scripts/tracetool/backend/log.py | 2 +-
15 files changed, 106 insertions(+), 66 deletions(-)