From nobody Fri Nov 14 02:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584524420; cv=none; d=zohomail.com; s=zohoarc; b=ctgA+4w8Brkm461zzTo2gA2KKz/naHDwceZ87pc2LbeFBbu0kGoe7AoLxKyhHrldNRQ0QKMkP2ydPQielYHhhgcoD4CDhduHnZftROE9HV9js8V5uoSXfofgjnXtS0kThtksIFet3+yE+JvJ8b+X2pw+POAze7tlOZwzrJHrDh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584524420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=kJwKgTSRC6h6xpwjuG1kqNwpe/QKsH+CqsiHa4ub1bA=; b=h0rEcR8fC2LfvtPPrUih9XiNPGRl/1gf32kPsGyD+kZa8EhFY8NinCfn5HfGvCUB2pYknyZuonSMXh1uIxnGlwZrPS61xcByTFhDpYtx9XZJ/AaXImwdNwHDBiO8wuB8VAA/lYSqG+y83jGv8bwHNCHNedEpHIbT5MJtegsxjlg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158452442034067.7658110297998; Wed, 18 Mar 2020 02:40:20 -0700 (PDT) Received: from localhost ([::1]:47578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEVBS-0005rs-H5 for importer@patchew.org; Wed, 18 Mar 2020 05:40:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51185) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEVAl-0005KO-MX for qemu-devel@nongnu.org; Wed, 18 Mar 2020 05:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEVAk-00012Q-8L for qemu-devel@nongnu.org; Wed, 18 Mar 2020 05:39:35 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:56693) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEVAk-0000yF-4X for qemu-devel@nongnu.org; Wed, 18 Mar 2020 05:39:34 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-78-D8a4qpHaOc2WIsVzTvSF-A-1; Wed, 18 Mar 2020 05:39:31 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD864800D5C; Wed, 18 Mar 2020 09:39:30 +0000 (UTC) Received: from localhost (ovpn-113-129.ams2.redhat.com [10.36.113.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B1CA5C241; Wed, 18 Mar 2020 09:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584524373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJwKgTSRC6h6xpwjuG1kqNwpe/QKsH+CqsiHa4ub1bA=; b=OUmIdVsGtqx7u7XrAeeHB42dDvnczFO28Qbxg2STM+94vEySltWgJ6kpJZCKS4ppx/cMNH AphGN5gguVp+Dt4jtn+HL5aYyATQw12k0If2DJ13S7MivD/Zep0O02jZi9qRqwvmjJ4f99 cciOh4WiYJ9TKzuiI4VJhngpU+7JlF8= X-MC-Unique: D8a4qpHaOc2WIsVzTvSF-A-1 From: Cornelia Huck To: qemu-devel@nongnu.org Subject: [PATCH for-5.0] compat: disable edid on correct virtio-gpu device Date: Wed, 18 Mar 2020 10:39:19 +0100 Message-Id: <20200318093919.24942-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Cornelia Huck , Gerd Hoffmann , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=C3=A1=C5=A1 Doktor Tested-by: Luk=C3=A1=C5=A1 Doktor Cc: qemu-stable@nongnu.org Signed-off-by: Cornelia Huck Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Sorry about my testing failure on the original patch, and thanks to Luk=C3=A1=C5=A1 for finding this. --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 9e8c06036faf..fa9f50db186e 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -53,7 +53,7 @@ GlobalProperty hw_compat_4_0[] =3D { { "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" }, --=20 2.21.1