Skip to contentSkip to conversation

compat: disable edid on correct virtio-gpu device

PATCH In review Cornelia Huck 2 participants 2 messages Mar 18, 2020

lore
Share & tools
lore
#0 lore raw

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

Commit bb15791166c1 ("compat: disable edid on virtio-gpu base device") tried to disable 'edid' on the virtio-gpu base device. However, that device is not 'virtio-gpu', but 'virtio-gpu-device'. Fix it.

Fixes bb15791166c1 ("compat: disable edid on virtio-gpu base device")

---

Sorry about my testing failure on the original patch, and thanks to Lukáš for finding this.

---
 hw/core/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/core/machine.c +1 -1
index 9e8c06036faf..fa9f50db186e 100644
@@ -53,7 +53,7 @@ GlobalProperty hw_compat_4_0[] = {
     { "secondary-vga",  "edid", "false" },
     { "bochs-display",  "edid", "false" },
     { "virtio-vga",     "edid", "false" },
-    { "virtio-gpu",     "edid", "false" },
+    { "virtio-gpu-device", "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.21.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Cornelia Huck

Commit bb15791166c1 ("compat: disable edid on virtio-gpu base device") tried to disable 'edid' on the virtio-gpu base device. However, that device is not 'virtio-gpu', but 'virtio-gpu-device'. Fix it.

Fixes bb15791166c1 ("compat: disable edid on virtio-gpu base device")
Quoted 23 lines

---

Sorry about my testing failure on the original patch, and thanks to Lukáš for finding this.

---
  hw/core/machine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/core/machine.c +1 -1
index 9e8c06036faf..fa9f50db186e 100644
@@ -53,7 +53,7 @@ GlobalProperty hw_compat_4_0[] = {
      { "secondary-vga",  "edid", "false" },
      { "bochs-display",  "edid", "false" },
      { "virtio-vga",     "edid", "false" },
-    { "virtio-gpu",     "edid", "false" },
+    { "virtio-gpu-device", "edid", "false" },
      { "virtio-device", "use-started", "false" },
      { "virtio-balloon-device", "qemu-4-0-config-size", "true" },
      { "pl031", "migrate-tick-offset", "false" },