Message ID | 20190806115819.16026-1-cohuck@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [for-4.1?] compat: disable edid on virtio-gpu base device | expand |
On Tue, Aug 06, 2019 at 01:58:19PM +0200, Cornelia Huck wrote: > 'edid' is a property of the virtio-gpu base device, so turning > it off on virtio-gpu-pci is not enough (it misses -ccw). Turn > it off on the base device instead. > > Fixes: 0a71966253c8 ("edid: flip the default to enabled") > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > Only just noticed this... should we still shove this into 4.1? > Or do we need a compat 4.1.1 dance for this? I'd say 4.1, doing it in 4.1.1 becomes too messy. Peter, can you apply this directly, or do you want a single-patch-pull-req instead? cheers, Gerd
On Tue, 6 Aug 2019 at 14:40, Gerd Hoffmann <kraxel@redhat.com> wrote: > > On Tue, Aug 06, 2019 at 01:58:19PM +0200, Cornelia Huck wrote: > > 'edid' is a property of the virtio-gpu base device, so turning > > it off on virtio-gpu-pci is not enough (it misses -ccw). Turn > > it off on the base device instead. > > > > Fixes: 0a71966253c8 ("edid: flip the default to enabled") > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > > > Only just noticed this... should we still shove this into 4.1? > > Or do we need a compat 4.1.1 dance for this? > > I'd say 4.1, doing it in 4.1.1 becomes too messy. > > Peter, can you apply this directly, or do you want > a single-patch-pull-req instead? If you're happy for it to go in I'll just apply it directly. thanks -- PMM
On Tue, 6 Aug 2019 at 14:42, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Tue, 6 Aug 2019 at 14:40, Gerd Hoffmann <kraxel@redhat.com> wrote: > > > > On Tue, Aug 06, 2019 at 01:58:19PM +0200, Cornelia Huck wrote: > > > 'edid' is a property of the virtio-gpu base device, so turning > > > it off on virtio-gpu-pci is not enough (it misses -ccw). Turn > > > it off on the base device instead. > > > > > > Fixes: 0a71966253c8 ("edid: flip the default to enabled") > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > > > Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > > > > > Only just noticed this... should we still shove this into 4.1? > > > Or do we need a compat 4.1.1 dance for this? > > > > I'd say 4.1, doing it in 4.1.1 becomes too messy. > > > > Peter, can you apply this directly, or do you want > > a single-patch-pull-req instead? > > If you're happy for it to go in I'll just apply it directly. Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1 for any user-visible changes. -- PMM
diff --git a/hw/core/machine.c b/hw/core/machine.c index 28a475ad97a3..32d1ca9abc5a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -32,7 +32,7 @@ GlobalProperty hw_compat_4_0[] = { { "secondary-vga", "edid", "false" }, { "bochs-display", "edid", "false" }, { "virtio-vga", "edid", "false" }, - { "virtio-gpu-pci", "edid", "false" }, + { "virtio-gpu", "edid", "false" }, { "virtio-device", "use-started", "false" }, { "virtio-balloon-device", "qemu-4-0-config-size", "true" }, { "pl031", "migrate-tick-offset", "false" },
'edid' is a property of the virtio-gpu base device, so turning it off on virtio-gpu-pci is not enough (it misses -ccw). Turn it off on the base device instead. Fixes: 0a71966253c8 ("edid: flip the default to enabled") Signed-off-by: Cornelia Huck <cohuck@redhat.com> --- Only just noticed this... should we still shove this into 4.1? Or do we need a compat 4.1.1 dance for this? --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)