Skip to content
  • Peter Maydell's avatar
    842038f5
    Merge remote-tracking branch... · 842038f5
    Peter Maydell authored
    
    Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
    
    trivial patches pull request 20200911
    
    # gpg: Signature made Fri 11 Sep 2020 20:32:27 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.2-pull-request:
      target/i386/kvm: Add missing fallthrough comment
      util/hexdump: Reorder qemu_hexdump() arguments
      util/hexdump: Convert to take a void pointer argument
      hw/arm/pxa2xx: Add missing fallthrough comment
      target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken()
      test-vmstate: remove unnecessary code in match_interval_mapping_node
      hw: hyperv: vmbus: Fix 32bit compilation
      kconfig: fix comment referring to old Makefiles
      meson.build: tweak sdl-image error message
      hw/net/e1000e: Remove duplicated write handler for FLSWDATA register
      hw/net/e1000e: Remove overwritten read handler for STATUS register
      Makefile: Skip the meson subdir in cscope/TAGS/ctags
      Makefile: Drop extra phony cscope
      hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP)
      hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR)
      hw/acpi/tco: Remove unused definitions
      hw/isa/isa-bus: Replace hw_error() by assert()
      hw/mips/fuloong2e: Convert pointless error message to an assert()
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	net/colo-compare.c
    842038f5
    Merge remote-tracking branch...
    Peter Maydell authored
    
    Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
    
    trivial patches pull request 20200911
    
    # gpg: Signature made Fri 11 Sep 2020 20:32:27 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.2-pull-request:
      target/i386/kvm: Add missing fallthrough comment
      util/hexdump: Reorder qemu_hexdump() arguments
      util/hexdump: Convert to take a void pointer argument
      hw/arm/pxa2xx: Add missing fallthrough comment
      target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken()
      test-vmstate: remove unnecessary code in match_interval_mapping_node
      hw: hyperv: vmbus: Fix 32bit compilation
      kconfig: fix comment referring to old Makefiles
      meson.build: tweak sdl-image error message
      hw/net/e1000e: Remove duplicated write handler for FLSWDATA register
      hw/net/e1000e: Remove overwritten read handler for STATUS register
      Makefile: Skip the meson subdir in cscope/TAGS/ctags
      Makefile: Drop extra phony cscope
      hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP)
      hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR)
      hw/acpi/tco: Remove unused definitions
      hw/isa/isa-bus: Replace hw_error() by assert()
      hw/mips/fuloong2e: Convert pointless error message to an assert()
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	net/colo-compare.c
Loading