Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: da1804d17a9ed7f060c072fbc4889db5fbc9c7d2 https://github.com/qemu/qemu/commit/da1804d17a9ed7f060c072fbc4889db5fbc9c7d2 Author: Boxuan Li <libox...@connect.hku.hk> Date: 2019-05-22 (Wed, 22 May 2019)
Changed paths: M hw/virtio/trace-events M hw/virtio/virtio-mmio.c Log Message: ----------- hw/virtio/virtio-mmio: Convert DPRINTF to trace and log Use traces for debug message and qemu_log_mask for errors. Signed-off-by: Boxuan Li <libox...@connect.hku.hk> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com> Reviewed-by: Alex Bennée <alex.ben...@linaro.org> Reviewed-by: Yuval Shaia <yuval.sh...@oracle.com> Message-Id: <20190503154424.73933-1-libox...@connect.hku.hk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 652141e49e2a54e7ee7f25652817396fe5b5e152 https://github.com/qemu/qemu/commit/652141e49e2a54e7ee7f25652817396fe5b5e152 Author: Philippe Mathieu-Daudé <phi...@redhat.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M roms/Makefile Log Message: ----------- roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description In commit 1cab464136b4 we incorrectly described the EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS options to the EDK2 build tools, but it only expands the CFLAGS (not to the CPPFLAGS). Update the description to be more accurate. Reported-by: Laszlo Ersek <ler...@redhat.com> Reviewed-by: Laszlo Ersek <ler...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> Message-Id: <20190506141923.12183-2-phi...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 60c85ec822cf306aef25d9831e61a811ac5328fa https://github.com/qemu/qemu/commit/60c85ec822cf306aef25d9831e61a811ac5328fa Author: Philippe Mathieu-Daudé <phi...@redhat.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M roms/Makefile Log Message: ----------- roms: List and describe the Makefile 'clean' rule Reviewed-by: Laszlo Ersek <ler...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> Message-Id: <20190506141923.12183-3-phi...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: b6eca81e1b6ce5f1b9d44c85019cb05e2a495cd7 https://github.com/qemu/qemu/commit/b6eca81e1b6ce5f1b9d44c85019cb05e2a495cd7 Author: Greg Kurz <gr...@kaod.org> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M migration/migration.c Log Message: ----------- migration: Fix typo in migrate_add_blocker() error message Signed-off-by: Greg Kurz <gr...@kaod.org> Reviewed-by: Stefano Garzarella <sgarz...@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Message-Id: <155800428514.543845.17558475870097990036.st...@bahia.lan> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 04c6e16f1f3ed052b1f06e2905ebe09fb5476cd5 https://github.com/qemu/qemu/commit/04c6e16f1f3ed052b1f06e2905ebe09fb5476cd5 Author: Markus Armbruster <arm...@redhat.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M configure Log Message: ----------- configure: Fix spelling of sdl-image in --help Fixes: a442fe2f2b2f20e7be0934277e9400b844b11999 Cc: qemu-triv...@nongnu.org Signed-off-by: Markus Armbruster <arm...@redhat.com> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20190517183246.11933-1-arm...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 0c0c8f8aaf084fc4bae15e92ef6b8c8e8a33e52e https://github.com/qemu/qemu/commit/0c0c8f8aaf084fc4bae15e92ef6b8c8e8a33e52e Author: Li Qiang <liq...@163.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M hw/vfio/pci.c Log Message: ----------- vfio: pci: make "vfio-pci-nohotplug" as MACRO The QOMConventions recommends we should use TYPE_FOO for a TypeInfo's name. Though "vfio-pci-nohotplug" is not used in other parts, for consistency we should make this change. CC: qemu-triv...@nongnu.org Signed-off-by: Li Qiang <liq...@163.com> Message-Id: <20190521151543.92274-2-liq...@163.com> Acked-by: Alex Williamson <alex.william...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Reviewed-by: Eric Auger <eric.au...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: da56e33006c3f2c0e703870f140b3ef72eb74aec https://github.com/qemu/qemu/commit/da56e33006c3f2c0e703870f140b3ef72eb74aec Author: Li Qiang <liq...@163.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M hw/vfio/amd-xgbe.c M hw/vfio/ap.c M hw/vfio/calxeda-xgmac.c M hw/vfio/ccw.c M hw/vfio/platform.c Log Message: ----------- hw: vfio: drop TYPE_FOO MACRO in VMStateDescription It's recommended that VMStateDescription names are decoupled from QOM type names as the latter may freely change without consideration of migration compatibility. Link: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02175.html CC: qemu-triv...@nongnu.org Signed-off-by: Li Qiang <liq...@163.com> Message-Id: <20190521151543.92274-3-liq...@163.com> Acked-by: Alex Williamson <alex.william...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Reviewed-by: Eric Auger <eric.au...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: bf04ef354c9d9d343d73d5dee0c0a62574a0e6bf https://github.com/qemu/qemu/commit/bf04ef354c9d9d343d73d5dee0c0a62574a0e6bf Author: Li Qiang <liq...@163.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M hw/vfio/platform.c Log Message: ----------- vfio: platform: fix a typo 'eventd' should be 'eventfd'. CC: qemu-triv...@nongnu.org Signed-off-by: Li Qiang <liq...@163.com> Message-Id: <20190521151543.92274-4-liq...@163.com> Acked-by: Alex Williamson <alex.william...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Reviewed-by: Eric Auger <eric.au...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 2d9574bdbed69b374116c59259f6bd14f7dfad7f https://github.com/qemu/qemu/commit/2d9574bdbed69b374116c59259f6bd14f7dfad7f Author: Li Qiang <liq...@163.com> Date: 2019-05-22 (Wed, 22 May 2019) Changed paths: M hw/pci/msix.c M hw/vfio/pci.c M include/hw/pci/msix.h Log Message: ----------- pci: msix: move 'MSIX_CAP_LENGTH' to header file 'MSIX_CAP_LENGTH' is defined in two .c file. Move it to hw/pci/msix.h file to reduce duplicated code. CC: qemu-triv...@nongnu.org Signed-off-by: Li Qiang <liq...@163.com> Message-Id: <20190521151543.92274-5-liq...@163.com> Acked-by: Alex Williamson <alex.william...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Reviewed-by: Eric Auger <eric.au...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: c4600d5d417ea13e0f1cc047b227a2b5b0e694f5 https://github.com/qemu/qemu/commit/c4600d5d417ea13e0f1cc047b227a2b5b0e694f5 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2019-05-23 (Thu, 23 May 2019) Changed paths: M configure M hw/pci/msix.c M hw/vfio/amd-xgbe.c M hw/vfio/ap.c M hw/vfio/calxeda-xgmac.c M hw/vfio/ccw.c M hw/vfio/pci.c M hw/vfio/platform.c M hw/virtio/trace-events M hw/virtio/virtio-mmio.c M include/hw/pci/msix.h M migration/migration.c M roms/Makefile Log Message: ----------- 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 <lviv...@redhat.com>" [full] # gpg: aka "Laurent Vivier <laur...@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lviv...@redhat.com>" [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 <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/94b63b6007cb...c4600d5d417e