diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-05 18:52:58 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-05 18:52:58 +0100 |
| commit | e2e3436add538be0e558cdc42f3e6b76e9deb0f9 (patch) | |
| tree | 9c96696d85c987d7d41630307f57b96c1ec423e0 /include | |
| parent | 3c2d3042849686969add641bd38b08b9877b9e8f (diff) | |
| parent | edbc4b24bbb179fa9562d4e5313470f10569433c (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181005-pull-request' into staging
vga: edid fixes, qxl clang workaround, vga mmio subregion fix.
# gpg: Signature made Fri 05 Oct 2018 12:11:40 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20181005-pull-request:
edid: fix vendor default
secondary-vga: delete mmio subregions upon exit
hw/display/qxl: Suppress clang-7 warning about misaligned atomic operation
edid: Ignore built binary
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/display/edid.h | 2 | ||||
| -rw-r--r-- | include/qemu/compiler.h | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index bd51d26916..bacf170889 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -4,7 +4,7 @@ #include "hw/hw.h" typedef struct qemu_edid_info { - const char *vendor; + const char *vendor; /* http://www.uefi.org/pnp_id_list */ const char *name; const char *serial; uint32_t dpi; diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 5843812710..bf47e7bee4 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -122,6 +122,15 @@ #ifndef __has_feature #define __has_feature(x) 0 /* compatibility with non-clang compilers */ #endif + +#ifndef __has_builtin +#define __has_builtin(x) 0 /* compatibility with non-clang compilers */ +#endif + +#if __has_builtin(__builtin_assume_aligned) || QEMU_GNUC_PREREQ(4, 7) +#define HAS_ASSUME_ALIGNED +#endif + /* Implement C11 _Generic via GCC builtins. Example: * * QEMU_GENERIC(x, (float, sinf), (long double, sinl), sin) (x) |