Re: [Qemu-devel] [PATCH] edid: flip the default to enabled

[Michael S. Tsirkin]

On Fri, Jun 07, 2019 at 10:34:44AM +0200, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <address@hidden>

Reviewed-by: Michael S. Tsirkin <address@hidden>

> ---
>  include/hw/virtio/virtio-gpu.h | 2 +-
>  hw/core/machine.c              | 8 +++++++-
>  hw/display/bochs-display.c     | 2 +-
>  hw/display/vga-pci.c           | 4 ++--
>  4 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
> index 8ecac1987a7f..6dd57f2025ec 100644
> --- a/include/hw/virtio/virtio-gpu.h
> +++ b/include/hw/virtio/virtio-gpu.h
> @@ -125,7 +125,7 @@ typedef struct VirtIOGPUBaseClass {
>  #define VIRTIO_GPU_BASE_PROPERTIES(_state, _conf)                       \
>      DEFINE_PROP_UINT32("max_outputs", _state, _conf.max_outputs, 1),    \
>      DEFINE_PROP_BIT("edid", _state, _conf.flags, \
> -                    VIRTIO_GPU_FLAG_EDID_ENABLED, false), \
> +                    VIRTIO_GPU_FLAG_EDID_ENABLED, true), \
>      DEFINE_PROP_UINT32("xres", _state, _conf.xres, 1024), \
>      DEFINE_PROP_UINT32("yres", _state, _conf.yres, 768)
>  
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index f1a0f45f9c83..84ebb8d24701 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 3d439eb2407b..681a047d793c 100644
> --- a/hw/display/bochs-display.c
> +++ b/hw/display/bochs-display.c
> @@ -336,7 +336,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 a17c96e703fe..3b76457ab077 100644
> --- a/hw/display/vga-pci.c
> +++ b/hw/display/vga-pci.c
> @@ -338,7 +338,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(),
> @@ -349,7 +349,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(),
>  };
> -- 
> 2.18.1