Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-reques...

Trivial patches pull request 20210503

# gpg: Signature made Mon 03 May 2021 09:34:56 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-6.1-pull-request: (23 commits)
  hw/rx/rx-gdbsim: Do not accept invalid memory size
  docs: More precisely describe memory-backend-*::id's user
  scripts: fix generation update-binfmts templates
  docs/system: Document the removal of "compat" property for POWER CPUs
  mc146818rtc: put it into the 'misc' category
  Do not include exec/address-spaces.h if it's not really necessary
  Do not include cpu.h if it's not really necessary
  Do not include hw/boards.h if it's not really necessary
  Do not include sysemu/sysemu.h if it's not really necessary
  hw: Do not include qemu/log.h if it is not necessary
  hw: Do not include hw/irq.h if it is not necessary
  hw: Do not include hw/sysbus.h if it is not necessary
  hw: Remove superfluous includes of hw/hw.h
  ui: Fix memory leak in qemu_xkeymap_mapping_table()
  hw/usb: Constify VMStateDescription
  hw/display/qxl: Constify VMStateDescription
  hw/arm: Constify VMStateDescription
  vmstate: Constify some VMStateDescriptions
  Fix typo in CFI build documentation
  hw/pcmcia: Do not register PCMCIA type if not required
  ...

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

diff --cc hw/arm/aspeed.c
Simple merge

diff --cc hw/arm/aspeed_ast2600.c
Simple merge

diff --cc hw/arm/aspeed_soc.c
Simple merge

diff --cc hw/isa/piix4.c
Simple merge

diff --cc hw/ssi/aspeed_smc.c
Simple merge

diff --cc target/hexagon/cpu.c
Simple merge

diff --cc target/hexagon/decode.c
Simple merge

diff --cc target/hexagon/genptr.c
index f93f8953ff2dce92fda0e8899540464046ef5be3,cea1f221e26cc0e3a75ec2db15fd2a26aad9f3ba..797a6c0cc94913f676cecd80eca6810e9931bdc7
--- 1/target/hexagon/genptr.c
--- 2/target/hexagon/genptr.c
+++ b/target/hexagon/genptr.c
@@@ -15,8 -15,8 +15,7 @@@
   *  along with this program; if not, see <http://www.gnu.org/licenses/>.
   */
  
 -#define QEMU_GENERATE
  #include "qemu/osdep.h"
- #include "qemu/log.h"
  #include "cpu.h"
  #include "internal.h"
  #include "tcg/tcg-op.h"