diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-13 13:25:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-13 13:25:25 +0100 |
| commit | 785a602eae7ad97076b9794ebaba072ad4a9f74f (patch) | |
| tree | 174522c44687bd9a5a56b0d4202281aededcbaca /hw/core/machine.c | |
| parent | 41dbe0df9a26e3e08d01fb025ea7429ff1f3c779 (diff) | |
| parent | 0a71966253c8b07586ebd6bee094a818e1e163b8 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190613-pull-request' into staging
edid: add xmax + ymax properties, enable by default.
# gpg: Signature made Thu 13 Jun 2019 08:38:18 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190613-pull-request:
edid: flip the default to enabled
edid: add xmax + ymax properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index f1a0f45f9c..84ebb8d247 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -24,7 +24,13 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" -GlobalProperty hw_compat_4_0_1[] = {}; +GlobalProperty hw_compat_4_0_1[] = { + { "VGA", "edid", "false" }, + { "secondary-vga", "edid", "false" }, + { "bochs-display", "edid", "false" }, + { "virtio-vga", "edid", "false" }, + { "virtio-gpu-pci", "edid", "false" }, +}; const size_t hw_compat_4_0_1_len = G_N_ELEMENTS(hw_compat_4_0_1); GlobalProperty hw_compat_4_0[] = {}; |