From nobody Sun Apr 28 04:14:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1566482465; cv=none; d=zoho.com; s=zohoarc; b=fOsBbdruG3CuW82II4bve6Q8RWnZGvDKQ8hRsL31+p+DfDr8YjSYSuFUkyAx++MfrSMp2/yvtuUZgD8Lz5XAzE0MAaPGs+/kvzd7zyZA0qvo/6vC88//DIYZ9CbwGNekptjw/idDI1l4wbyqsWoBLz98e2aujBgcxLFC/9lbVbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566482465; h=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:ARC-Authentication-Results; bh=ifo/xiNDI1LydS6G+8gbNt7bBDE4ZBl9J9/Dby1NVWA=; b=nwf6rI3YPsClIkJwVvHWGQwUHUXHHrIPp9QMC7brFg/H6JHhkuh9RYT4/5eMRar5e7mDEC5wuZ3/3HtdrVrStDa7XUkJK7HqiLV6D9vKRxQZ0gRvVAmkp4eSadspyhBWKDdE7Bi8mIlhYfRYZ+qFtxyiQWNq4D29L8BDFS9fD2k= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1566482465701472.39992459347434; Thu, 22 Aug 2019 07:01:05 -0700 (PDT) Received: from localhost ([::1]:43510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0ne7-0001gg-Qs for importer@patchew.org; Thu, 22 Aug 2019 10:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48227) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0nby-0008KJ-N7 for qemu-devel@nongnu.org; Thu, 22 Aug 2019 09:58:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0nbx-00048A-Pv for qemu-devel@nongnu.org; Thu, 22 Aug 2019 09:58:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10747) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i0nbx-00047i-L9; Thu, 22 Aug 2019 09:58:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EBAB988134E; Thu, 22 Aug 2019 13:58:44 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D2BB60CCD; Thu, 22 Aug 2019 13:58:44 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Thu, 22 Aug 2019 15:58:32 +0200 Message-Id: <20190822135839.32340-2-cohuck@redhat.com> In-Reply-To: <20190822135839.32340-1-cohuck@redhat.com> References: <20190822135839.32340-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Thu, 22 Aug 2019 13:58:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.1?] compat: disable edid on virtio-gpu base device 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: qemu-s390x@nongnu.org, Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" '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") Signed-off-by: Cornelia Huck --- 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(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 28a475ad97a3..32d1ca9abc5a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -32,7 +32,7 @@ GlobalProperty hw_compat_4_0[] =3D { { "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" }, --=20 2.20.1