Skip to contentSkip to conversation

compat: disable edid on virtio-gpu base device

PATCH Applied Cornelia Huck 3 participants 4 messages Aug 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compat: disable edid on virtio-gpu base device

'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")

---

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(-)
hw/core/machine.c +1 -1
index 28a475ad97a3..32d1ca9abc5a 100644
@@ -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" },
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Cornelia Huck

'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")
Quoted 2 lines

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

#2 lore raw
Quoted 11 lines · Gerd Hoffmann
Quoted 6 lines · Cornelia Huck

'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")
Quoted 7 lines
Quoted 2 lines

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

#3 lore raw
Quoted 16 lines · Peter Maydell
Quoted 14 lines · Gerd Hoffmann
Quoted 6 lines · Cornelia Huck

'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")
Quoted 2 lines

Only just noticed this... should we still shove this into 4.1? Or do we need a compat 4.1.1 dance for this?

Quoted 6 lines
Quoted 4 lines

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