From: Peter Maydell Date: Thu, 23 May 2019 11:00:37 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c4600d5d417ea13e0f1cc047b227a2b5b0e694f5;p=qemu.git Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging typo fixes, TYPE_XXX usage cleanup, comments update, virtio-mmio trace functions cleanup # gpg: Signature made Wed 22 May 2019 17:06:56 BST # gpg: using RSA key F30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier " [full] # gpg: aka "Laurent Vivier " [full] # gpg: aka "Laurent Vivier (Red Hat) " [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: pci: msix: move 'MSIX_CAP_LENGTH' to header file vfio: platform: fix a typo hw: vfio: drop TYPE_FOO MACRO in VMStateDescription vfio: pci: make "vfio-pci-nohotplug" as MACRO configure: Fix spelling of sdl-image in --help migration: Fix typo in migrate_add_blocker() error message roms: List and describe the Makefile 'clean' rule roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description hw/virtio/virtio-mmio: Convert DPRINTF to trace and log Signed-off-by: Peter Maydell --- c4600d5d417ea13e0f1cc047b227a2b5b0e694f5