mbox

[PULL,0/9] Trivial branch patches

Message ID 20190522160723.31484-1-laurent@vivier.eu
State New
Headers show

Pull-request

git://github.com/vivier/qemu.git tags/trivial-branch-pull-request

Message

Laurent Vivier May 22, 2019, 4:07 p.m. UTC 
The following changes since commit a4f667b6714916683408b983cfe0a615a725775f:

  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190521-3' into staging (2019-05-21 16:30:13 +0100)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-pull-request

for you to fetch changes up to 2d9574bdbed69b374116c59259f6bd14f7dfad7f:

  pci: msix: move 'MSIX_CAP_LENGTH' to header file (2019-05-22 17:35:27 +0200)

----------------------------------------------------------------
typo fixes, TYPE_XXX usage cleanup, comments update,
virtio-mmio trace functions cleanup

----------------------------------------------------------------

Boxuan Li (1):
  hw/virtio/virtio-mmio: Convert DPRINTF to trace and log

Greg Kurz (1):
  migration: Fix typo in migrate_add_blocker() error message

Li Qiang (4):
  vfio: pci: make "vfio-pci-nohotplug" as MACRO
  hw: vfio: drop TYPE_FOO MACRO in VMStateDescription
  vfio: platform: fix a typo
  pci: msix: move 'MSIX_CAP_LENGTH' to header file

Markus Armbruster (1):
  configure: Fix spelling of sdl-image in --help

Philippe Mathieu-Daudé (2):
  roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description
  roms: List and describe the Makefile 'clean' rule

 configure               |  2 +-
 hw/pci/msix.c           |  2 --
 hw/vfio/amd-xgbe.c      |  2 +-
 hw/vfio/ap.c            |  2 +-
 hw/vfio/calxeda-xgmac.c |  2 +-
 hw/vfio/ccw.c           |  2 +-
 hw/vfio/pci.c           |  8 ++++----
 hw/vfio/platform.c      |  6 +++---
 hw/virtio/trace-events  |  7 +++++++
 hw/virtio/virtio-mmio.c | 44 ++++++++++++++++++++---------------------
 include/hw/pci/msix.h   |  2 ++
 migration/migration.c   |  2 +-
 roms/Makefile           |  6 ++++--
 13 files changed, 47 insertions(+), 40 deletions(-)

Comments

Peter Maydell May 23, 2019, 11:56 a.m. UTC | #1 
On Wed, 22 May 2019 at 17:13, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit a4f667b6714916683408b983cfe0a615a725775f:
>
>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190521-3' into staging (2019-05-21 16:30:13 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
>
> for you to fetch changes up to 2d9574bdbed69b374116c59259f6bd14f7dfad7f:
>
>   pci: msix: move 'MSIX_CAP_LENGTH' to header file (2019-05-22 17:35:27 +0200)
>
> ----------------------------------------------------------------
> typo fixes, TYPE_XXX usage cleanup, comments update,
> virtio-mmio trace functions cleanup
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM