From nobody Thu May 2 10:41:16 2024 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=1584689227; cv=none; d=zohomail.com; s=zohoarc; b=mutOLfbsi7ld6m/bCHdbutVhG5DqU6jW6s3+h6HerqarauF2G+QzYS7zwYXYdCjyp/RC6/H1TsstGNDLhybWBcOIrHGYzkW9jKKRqFI5AIKw2bFG3QJiRu7LelW41R0o2QMj65m56HN0uKUs8OylJ55Ohi6JBz0UpMZS/+eHCUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584689227; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JC0+XTKsqUj6TF5WLQ/yKWtWHwtt9quJgaSUuuAkHbU=; b=YMsBSooQ2eAsSnEevotxuZfMukdgzb3lhSsAqqxNSknKF4uW3MUc/Zvu64QiuAJRDvhXFxm/AHWmDcOX1advY8KWpkYz1yKvVkitqj5H6jOnHfp6ZGkWZrzunKFF0tuSg4YBeAs1O8OFYJ+/fKkRNdudxjNl4G6AI8fUtG4+gns= 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 1584689227775982.9681797306473; Fri, 20 Mar 2020 00:27:07 -0700 (PDT) Received: from localhost ([::1]:48928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFC3e-0000Ks-7R for importer@patchew.org; Fri, 20 Mar 2020 03:27:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35938) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFC2W-0007qw-W0 for qemu-devel@nongnu.org; Fri, 20 Mar 2020 03:25:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFC2V-0000nf-Dj for qemu-devel@nongnu.org; Fri, 20 Mar 2020 03:25:56 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:54545) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jFC2V-0000nD-7i for qemu-devel@nongnu.org; Fri, 20 Mar 2020 03:25:55 -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-479-whxFBIg1PKibh8O2G-W82A-1; Fri, 20 Mar 2020 03:25:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 823D61857BE3; Fri, 20 Mar 2020 07:25:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-49.ams2.redhat.com [10.36.112.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98D59A7EB; Fri, 20 Mar 2020 07:25:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7A0B99B0C; Fri, 20 Mar 2020 08:25:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584689154; 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: in-reply-to:in-reply-to:references:references; bh=JC0+XTKsqUj6TF5WLQ/yKWtWHwtt9quJgaSUuuAkHbU=; b=esEbEshDf8SAwfkIPyD4m+KTvnn5cu6aP+1UBjWUMH8aFa5VHpfX6Q8mq4X8vqauBbWg+K FZn3jNrl4/H68ol+bQlDmvpKx0lI1qdCJjhvRnAw6FuF04LlCT9ZS2AFiMeuEsx9ioczGK oki/J/zNUW9Eshhf4Q7ZGj2bYc+hKZ4= X-MC-Unique: whxFBIg1PKibh8O2G-W82A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/1] compat: disable edid on correct virtio-gpu device Date: Fri, 20 Mar 2020 08:25:47 +0100 Message-Id: <20200320072547.19003-2-kraxel@redhat.com> In-Reply-To: <20200320072547.19003-1-kraxel@redhat.com> References: <20200320072547.19003-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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] [fuzzy] X-Received-From: 216.205.24.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: Cornelia Huck , Gerd Hoffmann , Eduardo Habkost , 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" From: 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") Reported-by: Luk=C3=A1=C5=A1 Doktor Tested-by: Luk=C3=A1=C5=A1 Doktor Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Cornelia Huck Message-id: 20200318093919.24942-1-cohuck@redhat.com Cc: qemu-stable@nongnu.org Signed-off-by: Cornelia Huck Signed-off-by: Gerd Hoffmann --- 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 b958cd1b991b..de0c42560534 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.18.2