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 /hw/display/edid-generate.c | |
| parent | 3c2d3042849686969add641bd38b08b9877b9e8f (diff) | |
| parent | edbc4b24bbb179fa9562d4e5313470f10569433c (diff) | |
| download | focaccia-qemu-e2e3436add538be0e558cdc42f3e6b76e9deb0f9.tar.gz focaccia-qemu-e2e3436add538be0e558cdc42f3e6b76e9deb0f9.zip | |
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 'hw/display/edid-generate.c')
| -rw-r--r-- | hw/display/edid-generate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/edid-generate.c b/hw/display/edid-generate.c index c80397ea96..37e60fe42a 100644 --- a/hw/display/edid-generate.c +++ b/hw/display/edid-generate.c @@ -301,7 +301,7 @@ void qemu_edid_generate(uint8_t *edid, size_t size, /* =============== set defaults =============== */ if (!info->vendor || strlen(info->vendor) != 3) { - info->vendor = "EMU"; + info->vendor = "RHT"; } if (!info->name) { info->name = "QEMU Monitor"; |