From: Peter Maydell Date: Wed, 5 May 2021 12:52:00 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-reques... X-Git-Tag: v6.1.0-rc0~140 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d45a5270d075ea589f0b0ddcf963a5fea1f500ac;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging 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 " [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-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 --- d45a5270d075ea589f0b0ddcf963a5fea1f500ac diff --cc target/hexagon/genptr.c index f93f8953ff2,cea1f221e26..797a6c0cc94 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@@ -15,8 -15,8 +15,7 @@@ * along with this program; if not, see . */ -#define QEMU_GENERATE #include "qemu/osdep.h" - #include "qemu/log.h" #include "cpu.h" #include "internal.h" #include "tcg/tcg-op.h"