Merge remote-tracking branch 'remotes/alistair/tags/pull-register-api-20200527' into...
commit87023dcc25895e03d6b8f2584f2a5178f9ce8050
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 28 May 2020 13:54:47 +0000 (28 14:54 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 28 May 2020 13:54:47 +0000 (28 14:54 +0100)
tree79f6b77115aa1812b15cd86d0c5c18fa321d4f8d
parentaacc7c8be2900f1f0a2a1bd241c5eeb58878bb28
parent5932a46c8a419db4a6402ac8ae42953b4d4fef1e
Merge remote-tracking branch 'remotes/alistair/tags/pull-register-api-20200527' into staging

A single patch to avoid clashes with the regiser field macros.

# gpg: Signature made Wed 27 May 2020 19:24:07 BST
# gpg:                using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
# gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full]
# Primary key fingerprint: F6C4 AC46 D493 4868 D3B8  CE8F 21E1 0D29 DF97 7054

* remotes/alistair/tags/pull-register-api-20200527:
  hw/registerfields: Prefix local variables with underscore in macros

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