Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-fixes-100920-1' into...

Various misc and testing fixes:

  - Expand CODING_STYLE.rst a little more
  - usb-host build fix
  - allow check-softfloat unit tests without TCG
  - simplify mips imm_branch so compiler isn't confused
  - mark ppc64abi32 for deprecation
  - more compiler soothing in pch_rev_id
  - allow acceptance to skip missing binaries
  - more a bunch of plugins to contrib

# gpg: Signature made Thu 10 Sep 2020 10:51:05 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-fixes-100920-1:
  plugins: move the more involved plugins to contrib
  tests/acceptance: Add Test.fetch_asset(cancel_on_missing=True)
  tests: bump avocado version
  hw/i386: make explicit clearing of pch_rev_id
  configure: don't enable ppc64abi32-linux-user by default
  docs/system/deprecated: mark ppc64abi32-linux-user for deprecation
  target/mips: simplify gen_compute_imm_branch logic
  tests/meson.build: fp tests don't need CONFIG_TCG
  usb-host: restrict workaround to new libusb versions
  CODING_STYLE.rst: flesh out our naming conventions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined MAINTAINERS
index cf96fa83795a5121c8a3425fca1cae2b70eadddd,018c4f94a9384985280161c869795b1870bc32c2..0a5f236aadb5f984d0f1090ba7b2486ad7ab2daa
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2423,11 -2423,6 +2423,11 @@@ F: tests/check-qom-interface.
  F: tests/check-qom-proplist.c
  F: tests/test-qdev-global-props.c
  
 +QOM boilerplate conversion script
 +M: Eduardo Habkost <ehabkost@redhat.com>
 +S: Maintained
 +F: scripts/codeconverter/
 +
  QMP
  M: Markus Armbruster <armbru@redhat.com>
  S: Supported
@@@ -2750,7 -2745,8 +2750,8 @@@ M: Alex Bennée <alex.bennee@linaro.org
  S: Maintained
  F: docs/devel/tcg-plugins.rst
  F: plugins/
- F: tests/plugin
+ F: tests/plugin/
+ F: contrib/plugins/
  
  AArch64 TCG target
  M: Richard Henderson <richard.henderson@linaro.org>

diff --combined Makefile
index 2ed19310cf74b23c0d7df921ed0bcbf9ffbe022f,b63f7dce529d21080d7252888aab4b80f10bde73..57f72f56c6cbc590471ce1ca8cef2ffef976a1b1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -106,6 -106,12 +106,12 @@@ config-host.mak: $(SRC_PATH)/configure 
  # Force configure to re-run if the API symbols are updated
  ifeq ($(CONFIG_PLUGIN),y)
  config-host.mak: $(SRC_PATH)/plugins/qemu-plugins.symbols
+ 
+ .PHONY: plugins
+ plugins:
+       $(call quiet-command,\
+               $(MAKE) $(SUBDIR_MAKEFLAGS) -C contrib/plugins V="$(V)", \
+               "BUILD", "example plugins")
  endif
  
  else
@@@ -128,7 -134,7 +134,7 @@@ build.ninja: config-host.ma
  Makefile: ;
  configure: ;
  
 -.PHONY: all clean cscope distclean install \
 +.PHONY: all clean distclean install \
        recurse-all dist msi FORCE
  
  SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet)
@@@ -221,22 -227,20 +227,22 @@@ distclean: clean ninja-distclea
        rm -f linux-headers/asm
        rm -Rf .sdk
  
 +find-src-path = find "$(SRC_PATH)/" -path "$(SRC_PATH)/meson" -prune -o -name "*.[chsS]"
 +
  .PHONY: ctags
  ctags:
        rm -f tags
 -      find "$(SRC_PATH)" -name '*.[hc]' -exec ctags --append {} +
 +      $(find-src-path) -exec ctags --append {} +
  
  .PHONY: TAGS
  TAGS:
        rm -f TAGS
 -      find "$(SRC_PATH)" -name '*.[hc]' -exec etags --append {} +
 +      $(find-src-path) -exec etags --append {} +
  
  .PHONY: cscope
  cscope:
        rm -f "$(SRC_PATH)"/cscope.*
 -      find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed -e 's,^\./,,' > "$(SRC_PATH)/cscope.files"
 +      $(find-src-path) -print | sed -e 's,^\./,,' > "$(SRC_PATH)/cscope.files"
        cscope -b -i"$(SRC_PATH)/cscope.files"
  
  # Needed by "meson install"
@@@ -258,6 -262,11 +264,11 @@@ help
        $(call print-help,cscope,Generate cscope index)
        $(call print-help,sparse,Run sparse on the QEMU source)
        @echo  ''
+ ifeq ($(CONFIG_PLUGIN),y)
+       @echo  'Plugin targets:'
+       $(call print-help,plugins,Build the example TCG plugins)
+       @echo  ''
+ endif
        @echo  'Cleaning targets:'
        $(call print-help,clean,Remove most generated files but keep the config)
        $(call print-help,distclean,Remove all generated files)

diff --combined hw/usb/host-libusb.c
index 2ba1de68df31dd44143d848c6f6eb8f0e3249b88,c5d38cb09c064c6cc5207635a8c5cf7fff93e4f3..43c93504a26bafc9d5cd7011cc53dc5aca668011
--- 1/hw/usb/host-libusb.c
--- 2/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@@ -34,7 -34,6 +34,7 @@@
   */
  
  #include "qemu/osdep.h"
 +#include "qom/object.h"
  #ifndef CONFIG_WIN32
  #include <poll.h>
  #endif
@@@ -61,10 -60,10 +61,10 @@@
  /* ------------------------------------------------------------------------ */
  
  #define TYPE_USB_HOST_DEVICE "usb-host"
 -#define USB_HOST_DEVICE(obj) \
 -     OBJECT_CHECK(USBHostDevice, (obj), TYPE_USB_HOST_DEVICE)
 -
  typedef struct USBHostDevice USBHostDevice;
 +DECLARE_INSTANCE_CHECKER(USBHostDevice, USB_HOST_DEVICE,
 +                         TYPE_USB_HOST_DEVICE)
 +
  typedef struct USBHostRequest USBHostRequest;
  typedef struct USBHostIsoXfer USBHostIsoXfer;
  typedef struct USBHostIsoRing USBHostIsoRing;
@@@ -943,7 -942,7 +943,7 @@@ static int usb_host_open(USBHostDevice 
      usb_host_ep_update(s);
  
      libusb_speed = libusb_get_device_speed(dev);
- #ifdef CONFIG_LINUX
+ #if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX)
      if (hostfd && libusb_speed == 0) {
          /*
           * Workaround libusb bug: libusb_get_device_speed() does not