aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-06-07 10:34:44 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-06-13 09:34:50 +0200
commit0a71966253c8b07586ebd6bee094a818e1e163b8 (patch)
tree32b10e1d6b164187a31945b2e5c3d8affb2dbe5b /hw
parent9b330e482fc652b96a61e25a575aed87c091715d (diff)
edid: flip the default to enabled
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20190607083444.32175-1-kraxel@redhat.com
Diffstat (limited to 'hw')
-rw-r--r--hw/core/machine.c8
-rw-r--r--hw/display/bochs-display.c2
-rw-r--r--hw/display/vga-pci.c4
3 files changed, 10 insertions, 4 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[] = {};
diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index 0a2a3e27c4..582133dd71 100644
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -338,7 +338,7 @@ static void bochs_display_exit(PCIDevice *dev)
static Property bochs_display_properties[] = {
DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * MiB),
- DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, false),
+ DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, true),
DEFINE_EDID_PROPERTIES(BochsDisplayState, edid_info),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index c66d9ec7ee..dedac5d128 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -340,7 +340,7 @@ static Property vga_pci_properties[] = {
DEFINE_PROP_BIT("qemu-extended-regs",
PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true),
DEFINE_PROP_BIT("edid",
- PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, false),
+ PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true),
DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info),
DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, false),
DEFINE_PROP_END_OF_LIST(),
@@ -351,7 +351,7 @@ static Property secondary_pci_properties[] = {
DEFINE_PROP_BIT("qemu-extended-regs",
PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true),
DEFINE_PROP_BIT("edid",
- PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, false),
+ PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true),
DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info),
DEFINE_PROP_END_OF_LIST(),
};