qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 749c1d: simpletrace: Convert name from mappin


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 749c1d: simpletrace: Convert name from mapping record to s...
Date: Sat, 30 Jun 2018 07:04:37 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 749c1d8e3e12c44247927d8f72f68ec0c0266f8b
      
https://github.com/qemu/qemu/commit/749c1d8e3e12c44247927d8f72f68ec0c0266f8b
  Author: Eduardo Habkost <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: Convert name from mapping record to str

The rest of the code assumes that idtoname is a (int -> str)
dictionary, so convert the data accordingly.

This is necessary to make the script work with Python 3 (where
reads from a binary file return 'bytes' objects, not 'str').

Fixes the following error:

  $ python3 ./scripts/simpletrace.py trace-events-all trace-27445
  b'object_class_dynamic_cast_assert' event is logged but is not \
  declared in the trace events file, try using trace-events-all instead.

Signed-off-by: Eduardo Habkost <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 82c4f87e0ed1701c1f51a46a3146643ed89b0bef
      
https://github.com/qemu/qemu/commit/82c4f87e0ed1701c1f51a46a3146643ed89b0bef
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M scripts/tracetool/backend/log.py

  Log Message:
  -----------
  trace: Fix format string for the struct timeval members casted to size_t

This fixes when using GCC with -Wformat-signedness:

    migration/trace.h: In function ‘_nocheck__trace_dirty_bitmap_load_success’:
    migration/trace.h:6368:24: error: format ‘%zd’ expects argument of type 
‘signed size_t’, but argument 3 has type ‘long unsigned int’ [-Werror=format=]
      qemu_log("address@hidden:dirty_bitmap_load_success " "" "\n",
             ~~^
             %ld
    migration/trace.h:6370:18:
         (size_t)_now.tv_sec, (size_t)_now.tv_usec
         ~~~~~~~~~~~~~~~~~~~
    migration/trace.h:6368:30: error: format ‘%zd’ expects argument of type 
‘signed size_t’, but argument 4 has type ‘long unsigned int’ [-Werror=format=]
      qemu_log("address@hidden:dirty_bitmap_load_success " "" "\n",
                 ~~~~^
                 %06ld
    migration/trace.h:6370:39:
         (size_t)_now.tv_sec, (size_t)_now.tv_usec
                              ~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dcfebcf9a3f350034d5acff6fe6019ce3586438a
      
https://github.com/qemu/qemu/commit/dcfebcf9a3f350034d5acff6fe6019ce3586438a
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/sd/trace-events

  Log Message:
  -----------
  sdcard: Reduce sdcard_set_blocklen() trace digits

Per the Physical Layer Simplified Spec. "5.3 CSD Register":

  "The maximum block length might therefore be in the range 512...2048 bytes"

Therefore 3 hexdigits are enough to report the block length.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0060918661faac174c7e75103ebd4d964c91c02e
      
https://github.com/qemu/qemu/commit/0060918661faac174c7e75103ebd4d964c91c02e
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/char/serial.c
    M hw/char/trace-events

  Log Message:
  -----------
  hw/char/serial: Convert from DPRINTF macro to trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: cb2d721cb3a2a83084141952f09a7363e2f52705
      
https://github.com/qemu/qemu/commit/cb2d721cb3a2a83084141952f09a7363e2f52705
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/char/parallel.c
    M hw/char/trace-events

  Log Message:
  -----------
  hw/char/parallel: Convert from pdebug() macro to trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 349632a29ddb7d2ac7a7dc26499640ab2123fc7b
      
https://github.com/qemu/qemu/commit/349632a29ddb7d2ac7a7dc26499640ab2123fc7b
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/input/trace-events
    M hw/input/tsc2005.c

  Log Message:
  -----------
  hw/input/tsc2005: Convert a fprintf() call to trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: cd4479a91a0f56d59dbc4be6341812009ce141f0
      
https://github.com/qemu/qemu/commit/cd4479a91a0f56d59dbc4be6341812009ce141f0
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/net/ne2000.c
    M hw/net/trace-events

  Log Message:
  -----------
  hw/net/ne2000: Add trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a816b62583acf36d78559eca483f32dd2c20c593
      
https://github.com/qemu/qemu/commit/a816b62583acf36d78559eca483f32dd2c20c593
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/net/ne2000.c
    M hw/net/trace-events

  Log Message:
  -----------
  hw/net/ne2000: Convert printf() calls to trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4b46fdd0d4ad2dcbdefd09d410cc90d84452ee2d
      
https://github.com/qemu/qemu/commit/4b46fdd0d4ad2dcbdefd09d410cc90d84452ee2d
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/net/etraxfs_eth.c
    M hw/net/trace-events

  Log Message:
  -----------
  hw/net/etraxfs_eth: Convert printf() calls to trace events

Suggested-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1a5396d961c8c90fea4cd2f740ccfd2633a8e10f
      
https://github.com/qemu/qemu/commit/1a5396d961c8c90fea4cd2f740ccfd2633a8e10f
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/block/fdc.c
    M hw/block/trace-events

  Log Message:
  -----------
  hw/block/fdc: Convert from FLOPPY_DPRINTF() macro to trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 13019f1fd6c683b243120b7eb999f1b50a224940
      
https://github.com/qemu/qemu/commit/13019f1fd6c683b243120b7eb999f1b50a224940
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c
    M hw/block/trace-events

  Log Message:
  -----------
  hw/block/pflash_cfi: Convert from DPRINTF() macro to trace events

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
[Fixed lx -> PRIx64 as suggested by Philippe.
--Stefan]
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6f4fa0998fd13bd8a533f38ee69774ecad6911b6
      
https://github.com/qemu/qemu/commit/6f4fa0998fd13bd8a533f38ee69774ecad6911b6
  Author: Peter Maydell <address@hidden>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M hw/block/fdc.c
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c
    M hw/block/trace-events
    M hw/char/parallel.c
    M hw/char/serial.c
    M hw/char/trace-events
    M hw/input/trace-events
    M hw/input/tsc2005.c
    M hw/net/etraxfs_eth.c
    M hw/net/ne2000.c
    M hw/net/trace-events
    M hw/sd/trace-events
    M scripts/simpletrace.py
    M scripts/tracetool/backend/log.py

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

Pull request

 * Python 3 support in simpletrace.py
 * Convert DPRINTF() to trace events

# gpg: Signature made Fri 29 Jun 2018 18:53:05 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  hw/block/pflash_cfi: Convert from DPRINTF() macro to trace events
  hw/block/fdc: Convert from FLOPPY_DPRINTF() macro to trace events
  hw/net/etraxfs_eth: Convert printf() calls to trace events
  hw/net/ne2000: Convert printf() calls to trace events
  hw/net/ne2000: Add trace events
  hw/input/tsc2005: Convert a fprintf() call to trace events
  hw/char/parallel: Convert from pdebug() macro to trace events
  hw/char/serial: Convert from DPRINTF macro to trace events
  sdcard: Reduce sdcard_set_blocklen() trace digits
  trace: Fix format string for the struct timeval members casted to size_t
  simpletrace: Convert name from mapping record to str

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/275845ae65fd...6f4fa0998fd1
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]