Skip to content
  • Peter Maydell's avatar
    77c9e078
    Merge remote-tracking branch... · 77c9e078
    Peter Maydell authored
    
    Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging
    
    Trivial branch pull request 20200610
    
    Convert DPRINTF() to traces or qemu_logs
    Use IEC binary prefix definitions
    Use qemu_semihosting_log_out() in target/unicore32
    Some code and doc cleanup
    
    # gpg: Signature made Wed 10 Jun 2020 14:08:36 BST
    # gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
    # gpg:                issuer "laurent@vivier.eu"
    # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
    # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
    # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
    # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
    
    * remotes/vivier2/tags/trivial-branch-for-5.1-pull-request:
      semihosting: remove the pthread include which seems unused
      hw/openrisc/openrisc_sim: Add assertion to silence GCC warning
      target/unicore32: Prefer qemu_semihosting_log_out() over curses
      target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR)
      target/unicore32: Remove unused headers
      target/i386/cpu: Use the IEC binary prefix definitions
      hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions
      hw/hppa/dino: Use the IEC binary prefix definitions
      hw/arm/aspeed: Correct DRAM container region size
      qemu-img: Fix doc typo for 'bitmap' subcommand
      hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf
      hw/isa/apm: Convert debug printf()s to trace events
      hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf()
      .mailmap: Update Fred Konrad email address
      net: Do not include a newline in the id of -nic devices
      Fix parameter type in vhost migration log path
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	.mailmap
    77c9e078
    Merge remote-tracking branch...
    Peter Maydell authored
    
    Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging
    
    Trivial branch pull request 20200610
    
    Convert DPRINTF() to traces or qemu_logs
    Use IEC binary prefix definitions
    Use qemu_semihosting_log_out() in target/unicore32
    Some code and doc cleanup
    
    # gpg: Signature made Wed 10 Jun 2020 14:08:36 BST
    # gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
    # gpg:                issuer "laurent@vivier.eu"
    # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
    # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
    # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
    # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
    
    * remotes/vivier2/tags/trivial-branch-for-5.1-pull-request:
      semihosting: remove the pthread include which seems unused
      hw/openrisc/openrisc_sim: Add assertion to silence GCC warning
      target/unicore32: Prefer qemu_semihosting_log_out() over curses
      target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR)
      target/unicore32: Remove unused headers
      target/i386/cpu: Use the IEC binary prefix definitions
      hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions
      hw/hppa/dino: Use the IEC binary prefix definitions
      hw/arm/aspeed: Correct DRAM container region size
      qemu-img: Fix doc typo for 'bitmap' subcommand
      hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf
      hw/isa/apm: Convert debug printf()s to trace events
      hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf()
      .mailmap: Update Fred Konrad email address
      net: Do not include a newline in the id of -nic devices
      Fix parameter type in vhost migration log path
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	.mailmap
Loading