diff mbox series

[57/78] compat: disable edid on correct virtio-gpu device

Message ID	20200616141547.24664-58-mdroth@linux.vnet.ibm.com
State	New
Headers	show Return-Path: <SRS0=f7ls=75=nongnu.org=qemu-devel-bounces+qemu-devel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DA5C20679 From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Subject: [PATCH 57/78] compat: disable edid on correct virtio-gpu device Date: Tue, 16 Jun 2020 09:15:26 -0500 Message-Id: <20200616141547.24664-58-mdroth@linux.vnet.ibm.com> In-Reply-To: <20200616141547.24664-1-mdroth@linux.vnet.ibm.com> References: <20200616141547.24664-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::241; envelope-from=flukshun@gmail.com; helo=mail-oi1-x241.google.com Precedence: list Cc: Cornelia Huck <cohuck@redhat.com>, qemu-stable@nongnu.org, Gerd Hoffmann <kraxel@redhat.com> Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>
Series	Patch Round-up for stable 4.2.1, freeze on 2020-06-22 \| expand [00/78] Patch Round-up for stable 4.2.1, freeze on 2020-06-22 [02/78] block/nbd: fix memory leak in nbd_open() [05/78] target/arm: ensure we use current exception state after SCR update [09/78] numa: properly check if numa is supported [11/78] arm/arm-powerctl: set NSACR.{CP11, CP10} bits in arm_set_cpu_on() [13/78] hw/i386/pc: fix regression in parsing vga cmdline parameter [15/78] ide: Fix incorrect handling of some PRDTs in ide_dma_cb() [16/78] target/arm: Set ISSIs16Bit in make_issinfo [17/78] virtio: update queue size on guest write [19/78] virtio: add ability to delete vq through a pointer [21/78] virtio: reset region cache when on queue deletion [22/78] virtio-net: delete also control queue when TX/RX deleted [23/78] intel_iommu: a fix to vtd_find_as_from_bus_num() [24/78] intel_iommu: add present bit check for pasid table entries [27/78] dp8393x: Mask EOL bit from descriptor addresses [29/78] dp8393x: Clean up endianness hacks [31/78] dp8393x: Update LLFA and CRDA registers from rx descriptor [32/78] dp8393x: Clear RRRA command register bit only when appropriate [35/78] dp8393x: Use long-word-aligned RRA pointers in 32-bit mode [36/78] dp8393x: Pad frames to word or long word boundary [39/78] dp8393x: Don't reset Silicon Revision register [42/78] plugins/core: add missing break in cb_to_tcg_flags [43/78] tcg: save vaddr temp for plugin usage [48/78] iotests/026: Test EIO on preallocated zero cluster [49/78] iotests/026: Test EIO on allocation in a data-file [50/78] virtio: gracefully handle invalid region caches [51/78] scsi/qemu-pr-helper: Fix out-of-bounds access to trnptid_list[] [52/78] block/qcow2-threads: fix qcow2_decompress [53/78] job: refactor progress to separate object [57/78] compat: disable edid on correct virtio-gpu device [58/78] qga: Installer: Wait for installation to finish [59/78] qga-win: Handle VSS_E_PROVIDER_ALREADY_REGISTERED error [60/78] qga-win: prevent crash when executing guest-file-read with large count [61/78] qga: Fix undefined C behavior [63/78] hw/i386/amd_iommu.c: Fix corruption of log events passed to guest [64/78] tcg/i386: Fix INDEX_op_dup2_vec [65/78] dump: Fix writing of ELF section [67/78] vhost-user-gpu: Release memory returned by vu_queue_pop() with free() [69/78] hostmem: don't use mbind() if host-nodes is empty [70/78] target/arm: Clear tail in gvec_fmul_idx_, gvec_fmla_idx_ [72/78] 9p: Lock directory streams with a CoMutex [73/78] net: Do not include a newline in the id of -nic devices [74/78] nbd/server: Avoid long error message assertions CVE-2020-10761 [77/78] virtio-balloon: unref the iothread when unrealizing

Commit Message

Michael Roth June 16, 2020, 2:15 p.m. UTC

From: Cornelia Huck <cohuck@redhat.com>

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")
Reported-by: Lukáš Doktor <ldoktor@redhat.com>
Tested-by: Lukáš Doktor <ldoktor@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-id: 20200318093919.24942-1-cohuck@redhat.com
Cc: qemu-stable@nongnu.org
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 02501fc39381c4dabaf6becdd12c2a4754c3847c)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 hw/core/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/hw/core/machine.c b/hw/core/machine.c
index aa63231f31..1872263bf0 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -37,7 +37,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" },