diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-24 09:31:26 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-24 09:31:26 +0100 |
| commit | d0ac9a61474cf594d19082bc8976247e984ea9a3 (patch) | |
| tree | 140d9ed53026e577e12e46e5837c924ae6a3c30e /include/hw | |
| parent | b22726abdfa54592d6ad88f65b0297c0e8b363e2 (diff) | |
| parent | c32c3d68ed0629910d5a1cd72bfb57d7f89b553b (diff) | |
| download | qemu-d0ac9a61474cf594d19082bc8976247e984ea9a3.zip qemu-d0ac9a61474cf594d19082bc8976247e984ea9a3.tar.gz qemu-d0ac9a61474cf594d19082bc8976247e984ea9a3.tar.bz2 | |
Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-06-21' into staging
* Documentation updates
* Remove leading underscores from header guards
* Display hexadecimal value with '0x' prefix
# gpg: Signature made Mon 21 Jun 2021 11:33:53 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/thuth-gitlab/tags/pull-request-2021-06-21:
MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section
fuzz: Display hexadecimal value with '0x' prefix
Remove leading underscores from QEMU defines
Update documentation to refer to new location for issues
docs/tools/virtiofsd: Fix bad rst syntax
docs/tools/virtiofsd.rst: Do not hard-code the QEMU binary name
docs/interop/live-block-operations: Do not hard-code the QEMU binary name
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/usb/dwc2-regs.h | 4 | ||||
| -rw-r--r-- | include/hw/usb/xlnx-usb-subsystem.h | 4 | ||||
| -rw-r--r-- | include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/hw/usb/dwc2-regs.h b/include/hw/usb/dwc2-regs.h index 40af23a..a7eb531 100644 --- a/include/hw/usb/dwc2-regs.h +++ b/include/hw/usb/dwc2-regs.h @@ -39,8 +39,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DWC2_HW_H__ -#define __DWC2_HW_H__ +#ifndef DWC2_HW_H +#define DWC2_HW_H #define HSOTG_REG(x) (x) diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-subsystem.h index 739bef7..999e423 100644 --- a/include/hw/usb/xlnx-usb-subsystem.h +++ b/include/hw/usb/xlnx-usb-subsystem.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _XLNX_VERSAL_USB_SUBSYSTEM_H_ -#define _XLNX_VERSAL_USB_SUBSYSTEM_H_ +#ifndef XLNX_VERSAL_USB_SUBSYSTEM_H +#define XLNX_VERSAL_USB_SUBSYSTEM_H #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h index 975a717..b76dce0 100644 --- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h @@ -23,8 +23,8 @@ * THE SOFTWARE. */ -#ifndef _XLNX_USB2_REGS_H_ -#define _XLNX_USB2_REGS_H_ +#ifndef XLNX_USB2_REGS_H +#define XLNX_USB2_REGS_H #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" |